mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-09 10:02:56 +01:00
Merge branch 'base-ruby-docker' into 'master'
E2E images for all usecases See merge request gitlab-org/gitlab-build-images!545
This commit is contained in:
Rémy Coutable
commit
b3a9491cff
6 changed files with 22 additions and 108 deletions
|
|
@ -33,18 +33,6 @@ gitlab-charts-build-base-helm-3.7:
|
|||
gitlab-helm3.5-kubectl1.17:
|
||||
extends: .build_and_deploy
|
||||
|
||||
gitlab-qa-ruby-2.7:
|
||||
extends: .build_and_deploy
|
||||
|
||||
gitlab-qa-ruby-3.0:
|
||||
extends: .build_and_deploy
|
||||
|
||||
gitlab-qa-alpine-ruby-2.7:
|
||||
extends: .build_and_deploy
|
||||
|
||||
gitlab-qa-alpine-ruby-3.0:
|
||||
extends: .build_and_deploy
|
||||
|
||||
gitlab-puppeteer:
|
||||
extends: .build_and_deploy
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +1,36 @@
|
|||
# Used by gitlab e2e tests and other qa related tasks
|
||||
|
||||
# Base image used by QA framework unit tests and other jobs not requiring full toolset
|
||||
e2e-base:
|
||||
variables:
|
||||
DEBIAN: bullseye
|
||||
GIT: '2.33'
|
||||
BUNDLER: '2.3'
|
||||
CHROME: '101'
|
||||
# Base image with just ruby and bundler
|
||||
e2e:
|
||||
extends:
|
||||
- .build_and_push
|
||||
variables:
|
||||
DEBIAN: bullseye
|
||||
BUNDLER: '2.3'
|
||||
parallel:
|
||||
matrix:
|
||||
- RUBY: [ '2.7', '3.0' ]
|
||||
|
||||
# Image with ruby, bundler and docker
|
||||
e2e-docker:
|
||||
extends:
|
||||
- e2e
|
||||
variables:
|
||||
DOCKER: '20.10.14'
|
||||
|
||||
# Image with additional chrome installed
|
||||
e2e-chrome:
|
||||
extends:
|
||||
- e2e-docker
|
||||
variables:
|
||||
CHROME: '101'
|
||||
|
||||
# Image used for running full e2e test suite
|
||||
e2e-full:
|
||||
extends:
|
||||
- e2e-chrome
|
||||
variables:
|
||||
LFS: '2.9'
|
||||
GIT: '2.33'
|
||||
GCLOUD: '383'
|
||||
KUBECTL: '1.23'
|
||||
DOCKER: '20.10.14'
|
||||
extends:
|
||||
- e2e-base
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
# 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="20.10.2"
|
||||
ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz"
|
||||
ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}"
|
||||
ENV DOCKER_CHECKSUM="893e0b05e347dee1d857022181831c6ec3798e9a49fda9a319b2f5a6fb79c42d"
|
||||
ENV DOCKER_BIN="/usr/local/bin/docker"
|
||||
|
||||
# Install dependencies
|
||||
RUN apk --no-cache add -U openssl tar gzip bash ca-certificates build-base curl && 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}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
# 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:3.0-alpine
|
||||
MAINTAINER GitLab Quality Team
|
||||
|
||||
WORKDIR /home/qa
|
||||
|
||||
ENV DOCKER_VERSION="20.10.2"
|
||||
ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz"
|
||||
ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}"
|
||||
ENV DOCKER_CHECKSUM="893e0b05e347dee1d857022181831c6ec3798e9a49fda9a319b2f5a6fb79c42d"
|
||||
ENV DOCKER_BIN="/usr/local/bin/docker"
|
||||
|
||||
# Install dependencies
|
||||
RUN apk --no-cache add -U openssl tar gzip bash ca-certificates build-base curl && 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}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
FROM ruby:2.7
|
||||
|
||||
|
||||
# Enable support for UTF encoded stdin/stdout
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
WORKDIR /home/qa
|
||||
|
||||
ENV DOCKER_VERSION="20.10.2"
|
||||
ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz"
|
||||
ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}"
|
||||
ENV DOCKER_CHECKSUM="893e0b05e347dee1d857022181831c6ec3798e9a49fda9a319b2f5a6fb79c42d"
|
||||
ENV DOCKER_BIN="/usr/local/bin/docker"
|
||||
|
||||
RUN wget -q ${DOCKER_URL} && \
|
||||
tar -zxf ${DOCKER_ARCHIVE} && \
|
||||
mv docker/docker ${DOCKER_BIN} && \
|
||||
echo "${DOCKER_CHECKSUM} ${DOCKER_BIN}" | sha256sum -c - && \
|
||||
rm ${DOCKER_ARCHIVE}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
FROM ruby:3.0
|
||||
|
||||
|
||||
# Enable support for UTF encoded stdin/stdout
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
WORKDIR /home/qa
|
||||
|
||||
ENV DOCKER_VERSION="20.10.2"
|
||||
ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz"
|
||||
ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}"
|
||||
ENV DOCKER_CHECKSUM="893e0b05e347dee1d857022181831c6ec3798e9a49fda9a319b2f5a6fb79c42d"
|
||||
ENV DOCKER_BIN="/usr/local/bin/docker"
|
||||
|
||||
RUN wget -q ${DOCKER_URL} && \
|
||||
tar -zxf ${DOCKER_ARCHIVE} && \
|
||||
mv docker/docker ${DOCKER_BIN} && \
|
||||
echo "${DOCKER_CHECKSUM} ${DOCKER_BIN}" | sha256sum -c - && \
|
||||
rm ${DOCKER_ARCHIVE}
|
||||
Loading…
Add table
Add a link
Reference in a new issue