From 22022491b9386700d3fc8153432ef07d30049782 Mon Sep 17 00:00:00 2001 From: "spaceBearAmadeus (Alex)" Date: Wed, 31 Jul 2024 13:38:39 -0400 Subject: [PATCH] refactor versions --- .dockerignore | 2 +- api/{CONTAINER_VERSION.txt => .CONTAINER_VERSION} | 0 api/.dockerignore | 2 +- api/Dockerfile-api | 2 +- assets/scripts/push_base.sh | 4 ++-- assets/scripts/push_image.sh | 4 ++-- worker/{CONTAINER_VERSION.txt => .CONTAINER_VERSION} | 0 worker/.dockerignore | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename api/{CONTAINER_VERSION.txt => .CONTAINER_VERSION} (100%) rename worker/{CONTAINER_VERSION.txt => .CONTAINER_VERSION} (100%) diff --git a/.dockerignore b/.dockerignore index 78185a5d8..878ef30af 100644 --- a/.dockerignore +++ b/.dockerignore @@ -22,7 +22,7 @@ coverage.xml tmp commit.sh kustomize -BASE_VERSION.txt +.BASE_VERSION README.md *.yaml unused.txt diff --git a/api/CONTAINER_VERSION.txt b/api/.CONTAINER_VERSION similarity index 100% rename from api/CONTAINER_VERSION.txt rename to api/.CONTAINER_VERSION diff --git a/api/.dockerignore b/api/.dockerignore index 6234f4434..57767f0d8 100644 --- a/api/.dockerignore +++ b/api/.dockerignore @@ -25,7 +25,7 @@ tmp commit.sh kustomize scripts -BASE_VERSION.txt +.BASE_VERSION README.md *.yaml unused.txt diff --git a/api/Dockerfile-api b/api/Dockerfile-api index 98dee29c7..b775bcc21 100644 --- a/api/Dockerfile-api +++ b/api/Dockerfile-api @@ -1,6 +1,6 @@ # Api container -# TODO: Ensure read from BASE_VERSION.txt +# TODO: Ensure read from .BASE_VERSION FROM ghcr.io/biosimulators/bio-check-base:latest WORKDIR /app diff --git a/assets/scripts/push_base.sh b/assets/scripts/push_base.sh index 4089b9a67..fe2cc281b 100755 --- a/assets/scripts/push_base.sh +++ b/assets/scripts/push_base.sh @@ -6,8 +6,8 @@ version="$1" gh_username="$2" if [ "$version" == "" ]; then - version="$(cat ./assets/BASE_VERSION.txt)" + version="$(cat ./assets/.BASE_VERSION)" fi ./assets/scripts/push_image.sh "base" "$version" "$gh_username" -echo "$version" > ./assets/BASE_VERSION.txt \ No newline at end of file +echo "$version" > ./assets/.BASE_VERSION \ No newline at end of file diff --git a/assets/scripts/push_image.sh b/assets/scripts/push_image.sh index 60320b27e..902079201 100755 --- a/assets/scripts/push_image.sh +++ b/assets/scripts/push_image.sh @@ -27,9 +27,9 @@ docker push ghcr.io/biosimulators/bio-check-"$lib":latest # handle version if [ "$lib" == "base" ]; then - VERSION_FILE=./assets/BASE_VERSION.txt + VERSION_FILE=./assets/.BASE_VERSION else - VERSION_FILE=./"$lib"/CONTAINER_VERSION.txt + VERSION_FILE=./"$lib"/.CONTAINER_VERSION fi echo "$version" > "$VERSION_FILE" diff --git a/worker/CONTAINER_VERSION.txt b/worker/.CONTAINER_VERSION similarity index 100% rename from worker/CONTAINER_VERSION.txt rename to worker/.CONTAINER_VERSION diff --git a/worker/.dockerignore b/worker/.dockerignore index 5db30aa5d..e0b3978ed 100644 --- a/worker/.dockerignore +++ b/worker/.dockerignore @@ -25,7 +25,7 @@ tmp commit.sh kustomize scripts -BASE_VERSION.txt +.BASE_VERSION README.md *.yaml unused.txt