diff --git a/dev-scripts/build_and_push_release.sh b/dev-scripts/build_and_push_release.sh index f02be97..d005342 100755 --- a/dev-scripts/build_and_push_release.sh +++ b/dev-scripts/build_and_push_release.sh @@ -8,7 +8,7 @@ set -x pwd -CAPROVER_VERSION_FROM_TAG=$1 + IMAGE_NAME=caprover/caprover if [ ! -f ./package-lock.json ]; then @@ -33,12 +33,10 @@ npm ci npm run build node ./dev-scripts/validate-build-version-docker-hub.js -# Get version from constant file -# Get version from tag (CAPROVER_VERSION_FROM_TAG) env var -# Make sure the two are the same -# Run API request to DockerHub and make sure it's a new version -docker build -t $IMAGE_NAME:$CAPROVER_VERSION_FROM_TAG -t $IMAGE_NAME:latest -f dockerfile-captain.release . -docker push $IMAGE_NAME:$CAPROVER_VERSION_FROM_TAG +source ./version + +docker build -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.release . +docker push $IMAGE_NAME:$CAPROVER_VERSION docker push $IMAGE_NAME:latest diff --git a/dev-scripts/validate-build-version-docker-hub.js b/dev-scripts/validate-build-version-docker-hub.js index e0015b1..86d5409 100644 --- a/dev-scripts/validate-build-version-docker-hub.js +++ b/dev-scripts/validate-build-version-docker-hub.js @@ -91,7 +91,7 @@ Promise.resolve() ) } - fs.outputFileSync(`./version`, version) + fs.outputFileSync(`./version`, `export CAPROVER_VERSION="${version}"`) }) .catch(function (err) { console.error(err)