From 626403d93fe90cf608eeed59d1ed553b6f89c666 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 9 Oct 2020 14:13:10 -0700 Subject: [PATCH] Add GitLab QA build images for Ruby 2.7 --- .gitlab-ci.yml | 4 ++++ Dockerfile.gitlab-qa-alpine-ruby-2.7 | 24 ++++++++++++++++++++++++ Dockerfile.gitlab-qa-ruby-2.7 | 12 ++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 Dockerfile.gitlab-qa-alpine-ruby-2.7 create mode 100644 Dockerfile.gitlab-qa-ruby-2.7 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 257e7ce..012401d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,7 +91,9 @@ ruby-alpine-aws test: *test_build gitlab-charts-build-base test: *test_build gitlab-helm3-kubectl1.14 test: *test_build gitlab-qa-ruby-2.6 test: *test_build +gitlab-qa-ruby-2.7 test: *test_build gitlab-qa-alpine-ruby-2.6 test: *test_build +gitlab-qa-alpine-ruby-2.7 test: *test_build gitlab-puppeteer test: *test_build omnibus-gitlab-bionic test: *test_build omnibus-gitlab-centos6 test: *test_build @@ -156,7 +158,9 @@ ruby-alpine-aws: *build_and_deploy gitlab-charts-build-base: *build_and_deploy gitlab-helm3-kubectl1.14: *build_and_deploy gitlab-qa-ruby-2.6: *build_and_deploy +gitlab-qa-ruby-2.7: *build_and_deploy gitlab-qa-alpine-ruby-2.6: *build_and_deploy +gitlab-qa-alpine-ruby-2.7: *build_and_deploy gitlab-puppeteer: *build_and_deploy omnibus-gitlab-bionic: *build_and_deploy omnibus-gitlab-centos6: *build_and_deploy diff --git a/Dockerfile.gitlab-qa-alpine-ruby-2.7 b/Dockerfile.gitlab-qa-alpine-ruby-2.7 new file mode 100644 index 0000000..96991ff --- /dev/null +++ b/Dockerfile.gitlab-qa-alpine-ruby-2.7 @@ -0,0 +1,24 @@ +# Used by: +# - GitLab CE/EE Review: https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/review.gitlab-ci.yml +# - Nightly QA: https://gitlab.com/gitlab-org/quality/nightly/blob/master/.gitlab-ci.yml +# - QA Pipeline Common: https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/qa.yml, https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/qa-scheduled.yml + +FROM ruby:2.7-alpine +MAINTAINER GitLab Quality Team + +WORKDIR /home/qa + +ENV DOCKER_VERSION="18.06.1" +ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}-ce.tgz" +ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}" +ENV DOCKER_CHECKSUM="2d92728714d794f78619785a2c638b58b0b15e60b340de51886bf6d3730f31f0" +ENV DOCKER_BIN="/usr/local/bin/docker" + +# Install dependencies +RUN apk --no-cache add -U openssl tar gzip bash ca-certificates build-base && mkdir -p /opt + +RUN wget -q ${DOCKER_URL} && \ + tar -zxf ${DOCKER_ARCHIVE} && \ + mv docker/docker ${DOCKER_BIN} && \ + echo "${DOCKER_CHECKSUM} ${DOCKER_BIN}" | sha256sum -c - && \ + rm ${DOCKER_ARCHIVE} diff --git a/Dockerfile.gitlab-qa-ruby-2.7 b/Dockerfile.gitlab-qa-ruby-2.7 new file mode 100644 index 0000000..f23c553 --- /dev/null +++ b/Dockerfile.gitlab-qa-ruby-2.7 @@ -0,0 +1,12 @@ +FROM ruby:2.7 + + +# Enable support for UTF encoded stdin/stdout +ENV LANG C.UTF-8 + +WORKDIR /home/qa + +RUN wget -q https://download.docker.com/linux/static/stable/x86_64/docker-19.03.1.tgz && \ + tar -zxf docker-19.03.1.tgz && mv docker/docker /usr/local/bin/docker && \ + echo "9b6191f64cb89e706dc29390408260d643e88f7f853d8878b2fb0360186b2ac3 /usr/local/bin/docker" | sha256sum -c - && \ + rm docker-19.03.1.tgz