Skip to content

Commit

Permalink
fix: Update version setting script (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
bigpick authored Dec 4, 2023
1 parent 2a2eccb commit ab713b7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the Docker image
run: make
11 changes: 4 additions & 7 deletions .github/workflows/publish-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and publish the Docker image
run: make OFFICIAL_BUILD=y PUBLISH=y

#- name: Extract metadata (tags, labels) for Docker
# id: meta
# uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
# with:
# images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
env:
OFFICIAL_BUILD: y
PUBLISH: y
run: make
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
FROM nvidia/cuda:12.3.0-devel-ubuntu22.04

LABEL org.opencontainers.image.licenses=MIT
LABEL org.opencontainers.image.description="Up to date CUDA container built to be a one-click runnable Hashtopolis agent to use on VastAI"
LABEL org.opencontainers.image.description="Up-to-date CUDA container built to be a one-click runnable Hashtopolis agent to use on Vast.ai."
LABEL org.opencontainers.image.source=https://github.com/ThatOnePasswordWas40Passwords/vast-hashtopolis-runner

ENV DEBIAN_FRONTEND=NONINTERACTIVE
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.0
0.1.1
3 changes: 3 additions & 0 deletions scripts/get-vers
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ dir=$PWD
[[ "${1-}" != "" ]] && dir=${1}

if [[ "${IMG_VERSION-}" != "" ]]; then
echo "=> Detected previously set IMG_VERSION" 1>&2;
echo "${IMG_VERSION}"
else
if [[ "${OFFICIAL_BUILD-}" != "" ]]; then
echo "=> Detected OFFICIAL_BUILD, using in file VERSION" 1>&2;
cat "${dir}/VERSION"
else
echo "=> Did not detect OFFICIAL_BUILD envar, using current git sha" 1>&2;
echo "0.0.0+$(git rev-parse --short HEAD)"
fi
fi

0 comments on commit ab713b7

Please sign in to comment.