Tag crane/gcrane images with Git tag (#990)

google · Apr 23, 2021 · 0976a27 · 0976a27
1 parent f37e4de
commit 0976a27
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -4,8 +4,9 @@ steps:
   args:
   - -c
   - |
-    set -ex
+    set -eux
 
+    export GOROOT=/usr/local/go
     export GO111MODULE=off
     export KO_DOCKER_REPO="gcr.io/$PROJECT_ID"
     export GOFLAGS="-ldflags=-X=github.com/google/go-containerregistry/cmd/crane/cmd.Version=$COMMIT_SHA"
@@ -17,23 +18,28 @@ steps:
     ln -s $$PWD $$shadow || stat $$shadow
 
     # Install ko from release.
-    curl -L -o ko.tar.gz https://github.com/google/ko/releases/download/v0.6.0/ko_0.6.0_Linux_i386.tar.gz
+    curl -L -o ko.tar.gz https://github.com/google/ko/releases/download/v0.8.2/ko_0.8.2_Linux_i386.tar.gz
     tar xvfz ko.tar.gz
     chmod +x ko
     alias ko=./ko
 
     # Use the ko binary to build the crane and gcrane builder images.
-    ko publish --platform=all -B github.com/google/go-containerregistry/cmd/crane -t latest -t "$COMMIT_SHA"
-    ko publish --platform=all -B github.com/google/go-containerregistry/cmd/gcrane -t latest -t "$COMMIT_SHA"
+    ko publish --platform=all -B github.com/google/go-containerregistry/cmd/crane  -t latest -t "$COMMIT_SHA" -t "$TAG_NAME"
+    ko publish --platform=all -B github.com/google/go-containerregistry/cmd/gcrane -t latest -t "$COMMIT_SHA" -t "$TAG_NAME"
 
     # Use the ko binary to build the crane and gcrane builder *debug* images.
-    export KO_CONFIG_PATH=/workspace/.ko/debug/
-    ko publish --platform=all -B github.com/google/go-containerregistry/cmd/crane -t debug
-    ko publish --platform=all -B github.com/google/go-containerregistry/cmd/gcrane -t debug
+    export KO_CONFIG_PATH=./.ko/debug/
+    ko publish --platform=all -B github.com/google/go-containerregistry/cmd/crane  -t "debug"
+    ko publish --platform=all -B github.com/google/go-containerregistry/cmd/gcrane -t "debug"
+
+    # Tag-specific debug images are pushed to gcr.io/go-containerregistry/{g}crane/debug:...
+    KO_DOCKER_REPO=gcr.io/$PROJECT_ID/crane/debug  ko publish --platform=all --bare github.com/google/go-containerregistry/cmd/crane  -t latest -t "$COMMIT_SHA" -t "$TAG_NAME"
+    KO_DOCKER_REPO=gcr.io/$PROJECT_ID/gcrane/debug ko publish --platform=all --bare github.com/google/go-containerregistry/cmd/gcrane -t latest -t "$COMMIT_SHA" -t "$TAG_NAME"
 
 # Use the crane builder to get the digest for crane and gcrane.
 - name: gcr.io/$PROJECT_ID/crane
   args: ['digest', 'gcr.io/$PROJECT_ID/crane']
 
 - name: gcr.io/$PROJECT_ID/crane
   args: ['digest', 'gcr.io/$PROJECT_ID/gcrane']
+
diff --git a/cmd/crane/README.md b/cmd/crane/README.md
@@ -47,12 +47,14 @@ $ docker run --rm gcr.io/go-containerregistry/crane ls ubuntu
 12.10
 ```
 
-And it's also available with a shell, which uses the `debug` tag
+And it's also available with a shell, at the `:debug` tag:
 
 ```sh
 docker run --rm -it --entrypoint "/busybox/sh" gcr.io/go-containerregistry/crane:debug
 ```
 
+Tagged debug images are available at `gcr.io/go-containerregistry/crane/debug:[tag]`.
+
 ### Using with GitLab
 
 ```yaml

diff --git a/cmd/gcrane/README.md b/cmd/gcrane/README.md
@@ -56,8 +56,10 @@ gcr.io/google-containers/busybox@sha256:d8d3bc2c183ed2f9f10e7258f84971202325ee60
 gcr.io/google-containers/busybox:latest
 ```
 
-And it's also available with a shell, which uses the `debug` tag
+And it's also available with a shell, at the `:debug` tag:
 
 ```sh
 docker run --rm -it --entrypoint "/busybox/sh" gcr.io/go-containerregistry/gcrane:debug
 ```
+
+Tagged debug images are available at `gcr.io/go-containerregistry/gcrane/debug:[tag]`.