From 4687a3b967c2936b0364bfdc3029c2d998308e78 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Sat, 20 Feb 2021 21:46:19 +0000 Subject: [PATCH] Add Ruby 3.0-based image for www-gitlab-com repo Signed-off-by: Takuya Noguchi --- .gitlab-ci.yml | 2 ++ Dockerfile.www-gitlab-com-3.0 | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 Dockerfile.www-gitlab-com-3.0 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c4c6c9..48e72f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,6 +136,7 @@ release-tools test: *test_build sitespeed-gitlab test: *test_build ubi-release test: *test_build www-gitlab-com-2.7 test: *test_build +www-gitlab-com-3.0 test: *test_build build-git: *test_build terraform test: *test_build # Used by go projects for linting https://gitlab.com/gitlab-org/gitlab/blob/master/doc/development/go_guide/index.md#automatic-linting @@ -205,6 +206,7 @@ release-tools push: *build_and_deploy sitespeed-gitlab push: *build_and_deploy ubi-release push: *build_and_deploy www-gitlab-com-2.7 push: *build_and_deploy +www-gitlab-com-3.0 push: *build_and_deploy build-git push: *build_and_deploy terraform push: *build_and_deploy # Used by go projects for linting https://gitlab.com/gitlab-org/gitlab/blob/master/doc/development/go_guide/index.md#automatic-linting diff --git a/Dockerfile.www-gitlab-com-3.0 b/Dockerfile.www-gitlab-com-3.0 new file mode 100644 index 0000000..9e8694b --- /dev/null +++ b/Dockerfile.www-gitlab-com-3.0 @@ -0,0 +1,17 @@ +FROM gcr.io/google.com/cloudsdktool/cloud-sdk as gcloud-sdk + +FROM ruby:3.0.0-slim + +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 - + +# Set UTF-8 http://jaredmarkell.com/docker-and-locales/ +# Must be set after install-essentials is run +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8