From 0e7a55eb8af6ee1be611a8d04335c164c65f7e83 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 5 Jan 2022 08:35:44 -0800 Subject: [PATCH] Fold patched www-gitlab-com-3.0.patched-gsutil into www-gitlab-com-3.0 This eliminates an extra build. --- .gitlab/ci/custom.images.yml | 2 -- Dockerfile.www-gitlab-com-3.0 | 7 ++++--- Dockerfile.www-gitlab-com-3.0-patched-gsutil | 18 ------------------ 3 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 Dockerfile.www-gitlab-com-3.0-patched-gsutil diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml index 94ec58f..f3b7f49 100644 --- a/.gitlab/ci/custom.images.yml +++ b/.gitlab/ci/custom.images.yml @@ -49,7 +49,6 @@ release-tools test: *test_build sitespeed-gitlab test: *test_build ubi-release test: *test_build www-gitlab-com-3.0 test: *test_build -www-gitlab-com-3.0-patched-gsutil test: *test_build build-git: *test_build # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/-/blob/13-8-stable-ee/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml terraform test: *test_build @@ -95,7 +94,6 @@ release-tools push: *build_and_deploy sitespeed-gitlab push: *build_and_deploy ubi-release push: *build_and_deploy www-gitlab-com-3.0 push: *build_and_deploy -www-gitlab-com-3.0-patched-gsutil push: *build_and_deploy build-git push: *build_and_deploy # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/-/blob/13-8-stable-ee/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml terraform push: *build_and_deploy diff --git a/Dockerfile.www-gitlab-com-3.0 b/Dockerfile.www-gitlab-com-3.0 index 2f82bd4..26749ba 100644 --- a/Dockerfile.www-gitlab-com-3.0 +++ b/Dockerfile.www-gitlab-com-3.0 @@ -2,14 +2,15 @@ FROM gcr.io/google.com/cloudsdktool/cloud-sdk as gcloud-sdk FROM ruby:3.0.3-slim-buster -ADD /scripts/ /scripts/ -RUN /scripts/install-www-gitlab-com - # Install Google Cloud SDK for deploys via rsync COPY --from=gcloud-sdk /usr/lib/google-cloud-sdk /usr/lib/google-cloud-sdk COPY --from=gcloud-sdk /usr/share/google-cloud-sdk /usr/share/google-cloud-sdk RUN cd /usr/bin && find ../lib/google-cloud-sdk/bin -type f -executable -exec ln -s {} \;; cd - +ADD /scripts/ /scripts/ +ADD /patches /patches/ +RUN /scripts/install-www-gitlab-com + # Set UTF-8 http://jaredmarkell.com/docker-and-locales/ # Must be set after install-essentials is run ENV LANG C.UTF-8 diff --git a/Dockerfile.www-gitlab-com-3.0-patched-gsutil b/Dockerfile.www-gitlab-com-3.0-patched-gsutil deleted file mode 100644 index 26749ba..0000000 --- a/Dockerfile.www-gitlab-com-3.0-patched-gsutil +++ /dev/null @@ -1,18 +0,0 @@ -FROM gcr.io/google.com/cloudsdktool/cloud-sdk as gcloud-sdk - -FROM ruby:3.0.3-slim-buster - -# Install Google Cloud SDK for deploys via rsync -COPY --from=gcloud-sdk /usr/lib/google-cloud-sdk /usr/lib/google-cloud-sdk -COPY --from=gcloud-sdk /usr/share/google-cloud-sdk /usr/share/google-cloud-sdk -RUN cd /usr/bin && find ../lib/google-cloud-sdk/bin -type f -executable -exec ln -s {} \;; cd - - -ADD /scripts/ /scripts/ -ADD /patches /patches/ -RUN /scripts/install-www-gitlab-com - -# Set UTF-8 http://jaredmarkell.com/docker-and-locales/ -# Must be set after install-essentials is run -ENV LANG C.UTF-8 -ENV LANGUAGE C -ENV LC_ALL C.UTF-8