Merge pull request #21 from gcpug/fix-base

sonatard · web-flow · commit 591aead704c4 · 2022-02-10T16:00:26.000+09:00
Fix base image path
diff --git a/1.11/alpine/Dockerfile b/1.11/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:alpine
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ENV GOPATH=/go \
diff --git a/1.11/debian/Dockerfile b/1.11/debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:latest
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:latest
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ARG GOPATH=/go
diff --git a/1.11/slim/Dockerfile b/1.11/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:slim
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:slim
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ARG GOPATH=/go
diff --git a/1.13/alpine/Dockerfile b/1.13/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:alpine
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ENV GOPATH=/go \
diff --git a/1.13/debian/Dockerfile b/1.13/debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:latest
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:latest
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ARG GOPATH=/go
diff --git a/1.13/slim/Dockerfile b/1.13/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:slim
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:slim
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ARG GOPATH=/go
diff --git a/1.14/alpine/Dockerfile b/1.14/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:alpine
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ENV GOPATH=/go \
diff --git a/1.14/debian/Dockerfile b/1.14/debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:latest
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:latest
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ARG GOPATH=/go
diff --git a/1.14/slim/Dockerfile b/1.14/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:slim
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:slim
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ARG GOPATH=/go
diff --git a/1.15/alpine/Dockerfile b/1.15/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:alpine
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ENV GOPATH=/go \
diff --git a/1.15/debian/Dockerfile b/1.15/debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:latest
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:latest
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ARG GOPATH=/go
diff --git a/1.15/slim/Dockerfile b/1.15/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:slim
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:slim
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ARG GOPATH=/go
diff --git a/1.16/alpine/Dockerfile b/1.16/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:alpine
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ENV GOPATH=/go \
diff --git a/1.16/debian/Dockerfile b/1.16/debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:latest
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:latest
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ARG GOPATH=/go
diff --git a/1.16/slim/Dockerfile b/1.16/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:slim
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:slim
 LABEL maintainer "GCPUG <https://gcpug.jp/>"
 
 ARG GOPATH=/go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM google/cloud-sdk:alpine`
	`1`	`+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:alpine`
`2`	`2`	`LABEL maintainer "GCPUG <https://gcpug.jp/>"`
`3`	`3`
`4`	`4`	`ENV GOPATH=/go \`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM google/cloud-sdk:latest`
	`1`	`+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:latest`
`2`	`2`	`LABEL maintainer "GCPUG <https://gcpug.jp/>"`
`3`	`3`
`4`	`4`	`ARG GOPATH=/go`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM google/cloud-sdk:slim`
	`1`	`+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:slim`
`2`	`2`	`LABEL maintainer "GCPUG <https://gcpug.jp/>"`
`3`	`3`
`4`	`4`	`ARG GOPATH=/go`