NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-11 02:52: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

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