diff --git a/bin/release_docker.sh b/bin/release_docker.sh index 15e1b666..1aaaeac5 100755 --- a/bin/release_docker.sh +++ b/bin/release_docker.sh @@ -18,6 +18,7 @@ SUPPORTED_PLATFORMS="linux/amd64,linux/arm64,linux/arm/v7" TAG_NAME="${1:-$(git rev-parse --abbrev-ref HEAD)}" VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")" SHORT_VERSION="$(echo "$VERSION" | perl -pe 's/(\d+)\.(\d+)\.(\d+)/$1.$2/g')" +GIT_SHA=sha-"$(git rev-parse --short HEAD)" SELECTED_PLATFORMS="${2:-$SUPPORTED_PLATFORMS}" @@ -26,7 +27,7 @@ SELECTED_PLATFORMS="${2:-$SUPPORTED_PLATFORMS}" # docker login ghcr.io --username=pirate echo "[^] Building docker image" -./bin/build_docker.sh "$TAG_NAME" "$SELECTED_PLATFORMS" +./bin/build_docker.sh "$TAG_NAME" "$GIT_SHA" "$SELECTED_PLATFORMS" echo "[^] Uploading docker image" docker buildx build --platform "$SELECTED_PLATFORMS" --push . \ @@ -34,12 +35,16 @@ docker buildx build --platform "$SELECTED_PLATFORMS" --push . \ -t archivebox/archivebox:$TAG_NAME \ -t archivebox/archivebox:$VERSION \ -t archivebox/archivebox:$SHORT_VERSION \ + -t archivebox/archivebox:$GIT_SHA \ -t archivebox/archivebox:latest \ -t nikisweeting/archivebox \ -t nikisweeting/archivebox:$TAG_NAME \ -t nikisweeting/archivebox:$VERSION \ -t nikisweeting/archivebox:$SHORT_VERSION \ + -t nikisweeting/archivebox:$GIT_SHA \ -t nikisweeting/archivebox:latest \ -t ghcr.io/archivebox/archivebox/archivebox:$TAG_NAME \ -t ghcr.io/archivebox/archivebox/archivebox:$VERSION \ - -t ghcr.io/archivebox/archivebox/archivebox:$SHORT_VERSION \ No newline at end of file + -t ghcr.io/archivebox/archivebox/archivebox:$SHORT_VERSION \ + -t ghcr.io/archivebox/archivebox/archivebox:$GIT_SHA +