From d11b77ec35f3b09132c74da39f7eb8157d58221e Mon Sep 17 00:00:00 2001 From: Justin Poehnelt Date: Fri, 8 Jan 2021 21:43:48 +0000 Subject: [PATCH 1/4] fix: update docker image for gapic action --- actions/gapic/Dockerfile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/actions/gapic/Dockerfile b/actions/gapic/Dockerfile index afd292c..d5409e1 100644 --- a/actions/gapic/Dockerfile +++ b/actions/gapic/Dockerfile @@ -1,5 +1,14 @@ -FROM l.gcr.io/google/rbe-ubuntu18-04:latest -# https://github.com/GoogleCloudPlatform/container-definitions/tree/master +FROM ubuntu:21.04 + +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get -qq update \ + && apt-get -qq install curl python3 + +RUN curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.6.1/bazelisk-linux-amd64 -o bazel \ + && cp bazel /usr/local/bin/bazel \ + && chmod +x /usr/local/bin/bazel \ + && bazel version COPY entrypoint.sh /entrypoint.sh From 0334e35ec5eab2ba1e4e8d201448dd23fe952b7e Mon Sep 17 00:00:00 2001 From: Justin Poehnelt Date: Fri, 8 Jan 2021 21:45:52 +0000 Subject: [PATCH 2/4] fix: install git too --- actions/gapic/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/gapic/Dockerfile b/actions/gapic/Dockerfile index d5409e1..ef4d484 100644 --- a/actions/gapic/Dockerfile +++ b/actions/gapic/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:21.04 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get -qq update \ - && apt-get -qq install curl python3 + && apt-get -qq install curl python3 git RUN curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.6.1/bazelisk-linux-amd64 -o bazel \ && cp bazel /usr/local/bin/bazel \ From 9678ab9be10d563f10a904cfa79bbc7120ef4d54 Mon Sep 17 00:00:00 2001 From: Justin Poehnelt Date: Fri, 8 Jan 2021 21:56:43 +0000 Subject: [PATCH 3/4] fix: python installation --- actions/gapic/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/actions/gapic/Dockerfile b/actions/gapic/Dockerfile index ef4d484..c07cac7 100644 --- a/actions/gapic/Dockerfile +++ b/actions/gapic/Dockerfile @@ -3,13 +3,14 @@ FROM ubuntu:21.04 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get -qq update \ - && apt-get -qq install curl python3 git + && apt-get -qq install curl python3 python3-pip python3-distutils git RUN curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.6.1/bazelisk-linux-amd64 -o bazel \ && cp bazel /usr/local/bin/bazel \ && chmod +x /usr/local/bin/bazel \ && bazel version + COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] From 5648e2a8751c2e291ed6319fa65ed6193e9eb5e1 Mon Sep 17 00:00:00 2001 From: Justin Poehnelt Date: Fri, 8 Jan 2021 22:06:31 +0000 Subject: [PATCH 4/4] fix: python should be available --- actions/gapic/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/actions/gapic/Dockerfile b/actions/gapic/Dockerfile index c07cac7..e55eef1 100644 --- a/actions/gapic/Dockerfile +++ b/actions/gapic/Dockerfile @@ -3,13 +3,14 @@ FROM ubuntu:21.04 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get -qq update \ - && apt-get -qq install curl python3 python3-pip python3-distutils git + && apt-get -qq install curl python3 python3-pip python3-distutils python-is-python3 git RUN curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.6.1/bazelisk-linux-amd64 -o bazel \ && cp bazel /usr/local/bin/bazel \ && chmod +x /usr/local/bin/bazel \ && bazel version +RUN python --version COPY entrypoint.sh /entrypoint.sh