Skip to content

Commit

Permalink
updates to versioning
Browse files Browse the repository at this point in the history
  • Loading branch information
fredclausen committed Oct 5, 2023
1 parent 4f300e0 commit 3423a21
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ jobs:
build_platform_specific: ${{ github.event.inputs.use_test_image == 'false' || github.event.inputs.use_test_image == '' }}
build_nohealthcheck: ${{ github.event.inputs.use_test_image == 'false' || github.event.inputs.use_test_image == '' }}
build_baseimage_url: :python/:python-test-pr
get_version_method: file_in_container:file=/acarshub-version
get_version_method: file_in_container:file=/acarshub_version
secrets:
ghcr_token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/test-pr build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ jobs:
build_version_specific: false
build_platform_specific: false
build_nohealthcheck: false
get_version_method: file_in_container:file=/acarshub-version
get_version_method: file_in_container:file=/acarshub_version
secrets:
ghcr_token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ RUN set -x && \
rm -rf /src/* /tmp/* /var/lib/apt/lists/*

COPY rootfs/ /
COPY version-nextgen /acarshub-version
COPY version-nextgen /acarshub_version

EXPOSE 80
EXPOSE 5550
Expand All @@ -117,4 +117,4 @@ HEALTHCHECK --start-period=3600s --interval=600s CMD /scripts/healthcheck.sh
ARG BUILD_EXTRA="Build git"
# append BUILD_EXTRA to the only line in /acarshub-version
RUN set -x && \
echo "$(cat /acarshub-version) ${BUILD_EXTRA}" > /acarshub-version
echo "$(cat /acarshub_version) ${BUILD_EXTRA}" > /acarshub_version
2 changes: 1 addition & 1 deletion rootfs/webapp/acarshub_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
if LOCAL_TEST:
version_path = "../../VERSION"
else:
version_path = "/acarshub-version"
version_path = "/acarshub_version"
with open(version_path, "r") as f:
lines = f.read()
ACARSHUB_VERSION = lines.split("\n")[0].split(" ")[0].replace("v", "")
Expand Down

0 comments on commit 3423a21

Please sign in to comment.