Skip to content

Commit

Permalink
refactor versions
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexPatrie committed Jul 31, 2024
1 parent c66252b commit 2202249
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ coverage.xml
tmp
commit.sh
kustomize
BASE_VERSION.txt
.BASE_VERSION
README.md
*.yaml
unused.txt
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion api/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ tmp
commit.sh
kustomize
scripts
BASE_VERSION.txt
.BASE_VERSION
README.md
*.yaml
unused.txt
Expand Down
2 changes: 1 addition & 1 deletion api/Dockerfile-api
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions assets/scripts/push_base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
echo "$version" > ./assets/.BASE_VERSION
4 changes: 2 additions & 2 deletions assets/scripts/push_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion worker/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ tmp
commit.sh
kustomize
scripts
BASE_VERSION.txt
.BASE_VERSION
README.md
*.yaml
unused.txt
Expand Down

0 comments on commit 2202249

Please sign in to comment.