NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fold patched www-gitlab-com-3.0.patched-gsutil into www-gitlab-com-3.0

Browse source 
This eliminates an extra build.
This commit is contained in:
Stan Hu 2022-01-05 08:35:44 -08:00
parent 519554013c
commit 0e7a55eb8a
No known key found for this signature in database
GPG key ID: 8D3931AD39CC7A20
3 changed files with 4 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab/ci/custom.images.yml
View file

@ -49,7 +49,6 @@ release-tools test: *test_build
sitespeed-gitlab test: *test_build sitespeed-gitlab test: *test_build
ubi-release test: *test_build ubi-release test: *test_build
www-gitlab-com-3.0 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 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 # 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 terraform test: *test_build
@ -95,7 +94,6 @@ release-tools push: *build_and_deploy
sitespeed-gitlab push: *build_and_deploy sitespeed-gitlab push: *build_and_deploy
ubi-release push: *build_and_deploy ubi-release push: *build_and_deploy
www-gitlab-com-3.0 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 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 # 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 terraform push: *build_and_deploy

7
Dockerfile.www-gitlab-com-3.0
View file

@ -2,14 +2,15 @@ FROM gcr.io/google.com/cloudsdktool/cloud-sdk as gcloud-sdk
FROM ruby:3.0.3-slim-buster FROM ruby:3.0.3-slim-buster
ADD /scripts/ /scripts/
RUN /scripts/install-www-gitlab-com
# Install Google Cloud SDK for deploys via rsync # 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/lib/google-cloud-sdk /usr/lib/google-cloud-sdk
COPY --from=gcloud-sdk /usr/share/google-cloud-sdk /usr/share/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 - 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/ # Set UTF-8 http://jaredmarkell.com/docker-and-locales/
# Must be set after install-essentials is run # Must be set after install-essentials is run
ENV LANG C.UTF-8 ENV LANG C.UTF-8

18
Dockerfile.www-gitlab-com-3.0-patched-gsutil
View file

@ -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