diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33a9e4e..9f106ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,7 +126,6 @@ omnibus-gitlab-cve-search test: *test_build 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 # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/-/blob/13-8-stable-ee/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml @@ -188,7 +187,6 @@ omnibus-gitlab-cve-search push: *build_and_deploy 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 # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/-/blob/13-8-stable-ee/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml diff --git a/Dockerfile.www-gitlab-com-2.7 b/Dockerfile.www-gitlab-com-2.7 deleted file mode 100644 index bebe774..0000000 --- a/Dockerfile.www-gitlab-com-2.7 +++ /dev/null @@ -1,17 +0,0 @@ -FROM gcr.io/google.com/cloudsdktool/cloud-sdk as gcloud-sdk - -FROM ruby:2.7.2-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