chore: update dev-tools v1.15 on Alpine 3.18 (#1801)

GoogleCloudPlatform · Sep 6, 2023 · 89eef2b · 89eef2b
1 parent 7a1aa1b
commit 89eef2b
Show file tree

Hide file tree

Showing 4 changed files with 224 additions and 217 deletions.
diff --git a/infra/build/Makefile b/infra/build/Makefile
@@ -20,9 +20,7 @@ TERRAFORM_VALIDATOR_VERSION := 0.13.0
 CLOUD_SDK_VERSION := 444.0.0
 GSUITE_PROVIDER_VERSION := 0.1.22
 TERRAFORM_DOCS_VERSION := 0.16.0
-RUBY_VERSION := 3.0.6
 BATS_VERSION := 0.4.0
-GOLANG_VERSION := 1.20
 BATS_SUPPORT_VERSION := 0.3.0
 BATS_ASSERT_VERSION := 2.0.0
 BATS_MOCK_VERSION := 1.0.1
@@ -41,7 +39,7 @@ CFT_CLI_VERSION := 1.2.4
 KUBECTL_VERSION := 1.26.8
 TFLINT_VERSION := 0.41.0
 TINKEY_VERSION := 1.7.0
-ALPINE_VERSION := 3.16
+ALPINE_VERSION := 3.18
 # Updated by Update Tooling Workflow
 MODULE_SWAPPER_VERSION := 0.2.0
 
@@ -55,7 +53,7 @@ OPA_VERSION := 0.52.0
 # Updated by Update Tooling Workflow
 GCRANE_VERSION := 0.16.1
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.14.8
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.15.0
 DOCKER_TAG_MAJOR_VERSION_DEVELOPER_TOOLS := $(firstword $(subst ., , $(DOCKER_TAG_VERSION_DEVELOPER_TOOLS)))
 DOCKER_TAG_MINOR_VERSION_DEVELOPER_TOOLS := $(shell echo "${DOCKER_TAG_VERSION_DEVELOPER_TOOLS}" | awk -F. '{print $$1"."$$2}')
 
@@ -74,9 +72,7 @@ build-image-developer-tools:
 		--build-arg TERRAFORM_VERSION=${TERRAFORM_VERSION} \
 		--build-arg TERRAFORM_VALIDATOR_VERSION=${TERRAFORM_VALIDATOR_VERSION} \
 		--build-arg TERRAFORM_DOCS_VERSION=${TERRAFORM_DOCS_VERSION} \
-		--build-arg RUBY_VERSION=${RUBY_VERSION} \
 		--build-arg BATS_VERSION=${BATS_VERSION} \
-		--build-arg GOLANG_VERSION=${GOLANG_VERSION} \
 		--build-arg BATS_SUPPORT_VERSION=${BATS_SUPPORT_VERSION} \
 		--build-arg BATS_ASSERT_VERSION=${BATS_ASSERT_VERSION} \
 		--build-arg BATS_MOCK_VERSION=${BATS_MOCK_VERSION} \

diff --git a/infra/build/developer-tools/Dockerfile b/infra/build/developer-tools/Dockerfile
@@ -12,13 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # Download and verify the integrity of the download first
-ARG RUBY_VERSION
-ARG GOLANG_VERSION
 ARG ALPINE_VERSION
-
-FROM golang:$GOLANG_VERSION-alpine AS go
-
-FROM ruby:$RUBY_VERSION-alpine$ALPINE_VERSION
+FROM alpine:$ALPINE_VERSION
 
 # Required to override base path
 ARG KITCHEN_TEST_BASE_PATH="test/integration"
@@ -63,12 +58,9 @@ RUN apk add --no-cache \
     py3-google-auth \
     py3-google-api-python-client \
     py3-pygithub \
-    py3-requests
-
-# Install Golang
-COPY --from=go /usr/local/go/ /usr/local/go/
-RUN ln -s /usr/local/go/bin/go /usr/local/bin/go
-RUN ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt
+    py3-requests \
+    ruby-dev \
+    go
 
 # Add all build scripts
 ADD ./build/*.sh /build/
@@ -126,7 +118,7 @@ RUN /build/install_module-swapper.sh ${MODULE_SWAPPER_VERSION}
 WORKDIR /opt/kitchen
 ADD ./build/data/Gemfile .
 ADD ./build/data/Gemfile.lock .
-RUN gem install bundler:2.2.33 && bundle install --retry=10
+RUN gem install bundler:2.4.19 && bundle install --retry=10
 
 COPY ./build/verify_boilerplate/ /build/verify_boilerplate/
 RUN /build/install_verify_boilerplate.sh
@@ -178,13 +170,9 @@ RUN terraform --version && \
     kustomize version && \
     addlicense -help && \
     cft version && \
-    protoc --version
-
-# Add GO_PATH TO PATH
-ENV GO_PATH="/root/go"
-ENV PATH=$GO_PATH/bin:$PATH
+    protoc --version && \
+    go version
 
 # Cleanup intermediate build artifacts
 RUN rm -rf /build
-RUN go version
 CMD ["/bin/bash"]
diff --git a/infra/build/developer-tools/build/data/Gemfile b/infra/build/developer-tools/build/data/Gemfile
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 source 'https://rubygems.org/'
-gem "kitchen-terraform", "~> 6.1"
-gem "kubeclient", "~> 4.9"
-gem "rest-client", "~> 2.0"
-gem 'nokogiri', '~> 1.14'
-ruby '~> 3.0.6'
+gem "kitchen-terraform", "~> 7.0"
+gem "kubeclient", "~> 4.11"
+gem "rest-client", "~> 2.1"
+gem 'nokogiri', '~> 1.15'
+ruby '~> 3.2.2'