diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2022-12-15 03:27:35 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2022-12-15 03:27:35 +0300 |
| commit | 5b35a22d4b33d1f6edee78fec1c611114a9ea593 (patch) | |
| tree | 08208513b5acb6604ba61d2fe69fbb652e0479c5 | |
| parent | 897046a2eb983f65b846dd716259b0bd2b832bca (diff) | |
Set Ruby and Alpine as variables in single.Dockerfile
| -rw-r--r-- | .gitlab/ci/docker-images.gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | dockerfiles/single.Dockerfile | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml index 94f05b65..95edeb75 100644 --- a/.gitlab/ci/docker-images.gitlab-ci.yml +++ b/.gitlab/ci/docker-images.gitlab-ci.yml @@ -136,7 +136,7 @@ test:image:docs-single: - .docker_prepare stage: test variables: - GITLAB_VERSION: '15.5' + GITLAB_VERSION: '15.6' DOCKERFILE: dockerfiles/single.Dockerfile IMAGE_NAME: $CI_REGISTRY_IMAGE:$GITLAB_VERSION NANOC_ENV: test @@ -147,7 +147,7 @@ test:image:docs-single: - $DOCKERFILE script: - apk add --no-cache -U git - - git fetch -all + - git fetch --all - git checkout -b $GITLAB_VERSION origin/$GITLAB_VERSION - docker build --build-arg NANOC_ENV=${NANOC_ENV} @@ -193,7 +193,7 @@ test:image:docs-single-lunrjs: - .docker_prepare stage: test variables: - GITLAB_VERSION: '15.5' + GITLAB_VERSION: '15.6' IMAGE_NAME: $CI_REGISTRY_IMAGE/archives:$GITLAB_VERSION DOCKERFILE: dockerfiles/single.Dockerfile NANOC_ENV: test @@ -204,7 +204,7 @@ test:image:docs-single-lunrjs: - $DOCKERFILE script: - apk add --no-cache -U make bash git - - git fetch -all + - git fetch --all - git checkout -b $GITLAB_VERSION origin/$GITLAB_VERSION - docker build --build-arg NANOC_ENV=${NANOC_ENV} diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile index 1bebdbf8..6f578538 100644 --- a/dockerfiles/single.Dockerfile +++ b/dockerfiles/single.Dockerfile @@ -19,7 +19,11 @@ RUN apk add --no-cache git \ #- Start of builder stage -# -FROM ruby:2.7.6-alpine3.16 AS builder +# RUBY_VERSION and ALPINE_VERSION are defined in ../.gitlab-ci.yml +ARG RUBY_VERSION +ARG ALPINE_VERSION + +FROM ruby:${RUBY_VERSION}-alpine${ALPINE_VERSION} AS builder # Copy minifier binary from the minifier stage COPY --from=minifier /minify /usr/local/bin/minify |