From 3423a21686862f630634f0b7e6955f8bd74f7785 Mon Sep 17 00:00:00 2001 From: Fred Clausen <43556888+fredclausen@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:38:14 -0600 Subject: [PATCH] updates to versioning --- .github/workflows/deploy.yml | 2 +- .github/workflows/test-pr build.yml | 2 +- Dockerfile | 4 ++-- rootfs/webapp/acarshub_configuration.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 07425ee82..2fb241780 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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 }} diff --git a/.github/workflows/test-pr build.yml b/.github/workflows/test-pr build.yml index 3a2a6cd1a..76e410cb7 100644 --- a/.github/workflows/test-pr build.yml +++ b/.github/workflows/test-pr build.yml @@ -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 }} diff --git a/Dockerfile b/Dockerfile index 5c2ea0786..2f37cd4bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -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 diff --git a/rootfs/webapp/acarshub_configuration.py b/rootfs/webapp/acarshub_configuration.py index 4ffba69c1..f56b7185d 100755 --- a/rootfs/webapp/acarshub_configuration.py +++ b/rootfs/webapp/acarshub_configuration.py @@ -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", "")