diff options
author | Marcel Amirault <mamirault@gitlab.com> | 2023-09-25 11:12:35 +0300 |
---|---|---|
committer | Marcel Amirault <mamirault@gitlab.com> | 2023-09-25 11:12:35 +0300 |
commit | 05b472cd0689f476943084ccf0b5bc8551b1a4c6 (patch) | |
tree | 6be5588c3a197086b487c35ab50e03ac04208374 | |
parent | aa42dcc6717c7c2494d98b68e7013b49cd274e5c (diff) |
Revert "Merge branch 'eread/use-buildx-to-build-docker-images' into 'main'"revert-56599fc3
This reverts merge request !4246
-rw-r--r-- | .gitlab/ci/docker-images.gitlab-ci.yml | 57 | ||||
-rw-r--r-- | dockerfiles/gitlab-docs-base.Dockerfile | 2 | ||||
-rw-r--r-- | dockerfiles/gitlab-docs-lint-html.Dockerfile | 2 | ||||
-rw-r--r-- | dockerfiles/gitlab-docs-lint-markdown.Dockerfile | 2 | ||||
-rw-r--r-- | dockerfiles/single.Dockerfile | 2 |
5 files changed, 30 insertions, 35 deletions
diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml index 8317f388..b763bb00 100644 --- a/.gitlab/ci/docker-images.gitlab-ci.yml +++ b/.gitlab/ci/docker-images.gitlab-ci.yml @@ -8,19 +8,16 @@ .docker_prepare: extends: - .retry - image: "docker:${DOCKER_VERSION}" + image: docker:24.0.2 tags: - gitlab-org-docker services: - - "docker:${DOCKER_VERSION}-dind" + - docker:24.0.2-dind before_script: - docker info - - docker context create docs-context - - docker buildx create --use docs-context - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY variables: DOCKER_TLS_CERTDIR: "/certs" - DOCKER_VERSION: "24.0.6" # # Build and deploy the GitLab Docs base Docker image @@ -35,12 +32,12 @@ image:gitlab-docs-base: IMAGE_NAME: $CI_REGISTRY_IMAGE/base:alpine-$ALPINE_VERSION-ruby-$RUBY_VERSION-$CI_COMMIT_SHORT_SHA DOCKERFILE: dockerfiles/gitlab-docs-base.Dockerfile script: - - docker buildx build + - docker build --build-arg ALPINE_VERSION=${ALPINE_VERSION} --build-arg RUBY_VERSION=${RUBY_VERSION} --tag $IMAGE_NAME --file $DOCKERFILE . - --push + - docker push $IMAGE_NAME environment: name: registry/docs-base @@ -57,7 +54,7 @@ test:image:gitlab-docs-base: IMAGE_NAME: $CI_REGISTRY_IMAGE/base:alpine-$ALPINE_VERSION-ruby-$RUBY_VERSION-$CI_COMMIT_SHORT_SHA DOCKERFILE: dockerfiles/gitlab-docs-base.Dockerfile script: - - docker buildx build + - docker build --build-arg ALPINE_VERSION=${ALPINE_VERSION} --build-arg RUBY_VERSION=${RUBY_VERSION} --tag $IMAGE_NAME @@ -76,14 +73,14 @@ image:docs-lint-markdown: IMAGE_NAME: $CI_REGISTRY_IMAGE/lint-markdown:alpine-$ALPINE_VERSION-vale-$VALE_VERSION-markdownlint-$MARKDOWNLINT_VERSION-markdownlint2-$MARKDOWNLINT2_VERSION DOCKERFILE: dockerfiles/gitlab-docs-lint-markdown.Dockerfile script: - - docker buildx build + - docker build --build-arg ALPINE_VERSION=${ALPINE_VERSION} --build-arg VALE_VERSION=${VALE_VERSION} --build-arg MARKDOWNLINT_VERSION=${MARKDOWNLINT_VERSION} --build-arg MARKDOWNLINT2_VERSION=${MARKDOWNLINT2_VERSION} --tag $IMAGE_NAME --file $DOCKERFILE . - --push + - docker push $IMAGE_NAME environment: name: registry/docs-lint-markdown @@ -99,7 +96,7 @@ test:image:docs-lint-markdown: variables: DOCKERFILE: dockerfiles/gitlab-docs-lint-markdown.Dockerfile script: - - docker buildx build + - docker build --build-arg ALPINE_VERSION=${ALPINE_VERSION} --build-arg VALE_VERSION=${VALE_VERSION} --build-arg MARKDOWNLINT_VERSION=${MARKDOWNLINT_VERSION} @@ -119,12 +116,12 @@ image:docs-lint-html: IMAGE_NAME: $CI_REGISTRY_IMAGE/lint-html:alpine-$ALPINE_VERSION-ruby-$RUBY_VERSION-$CI_COMMIT_SHORT_SHA DOCKERFILE: dockerfiles/gitlab-docs-lint-html.Dockerfile script: - - docker buildx build + - docker build --build-arg RUBY_VERSION=${RUBY_VERSION} --build-arg ALPINE_VERSION=${ALPINE_VERSION} --tag $IMAGE_NAME --file $DOCKERFILE . - --push + - docker push $IMAGE_NAME environment: name: registry/docs-lint-html @@ -140,7 +137,7 @@ test:image:docs-lint-html: variables: DOCKERFILE: dockerfiles/gitlab-docs-lint-html.Dockerfile script: - - docker buildx build + - docker build --build-arg RUBY_VERSION=${RUBY_VERSION} --build-arg ALPINE_VERSION=${ALPINE_VERSION} --file $DOCKERFILE . @@ -167,14 +164,14 @@ image:docs-single: environment: name: registry/$CI_COMMIT_REF_SLUG script: - - docker buildx build + - docker build --build-arg NANOC_ENV=${NANOC_ENV} --build-arg VER=${CI_COMMIT_REF_NAME} --build-arg SEARCH_BACKEND="google" --build-arg GOOGLE_SEARCH_KEY=${GOOGLE_SEARCH_KEY} --tag $IMAGE_NAME --file $DOCKERFILE . - --push + - docker push $IMAGE_NAME # # Test the GitLab docs single version Docker image if changes made to its Dockerfile @@ -191,7 +188,7 @@ test:image:docs-single: NANOC_ENV: test needs: [] script: - - docker buildx build + - docker build --build-arg NANOC_ENV=${NANOC_ENV} --build-arg VER=${GITLAB_VERSION} --build-arg SEARCH_BACKEND="google" @@ -220,13 +217,13 @@ image:docs-single-lunrjs: environment: name: registry-archives/$CI_COMMIT_REF_SLUG script: - - docker buildx build + - docker build --build-arg NANOC_ENV=${NANOC_ENV} --build-arg VER=${CI_COMMIT_REF_NAME} --build-arg SEARCH_BACKEND="lunr" --tag $IMAGE_NAME --file $DOCKERFILE . - --push + - docker push $IMAGE_NAME # # Test the GitLab docs single version Docker image with lunr.js enabled @@ -245,7 +242,7 @@ test:image:docs-single-lunrjs: needs: [] script: - apk add make bash - - docker buildx build + - docker build --build-arg NANOC_ENV=${NANOC_ENV} --build-arg VER=${GITLAB_VERSION} --build-arg SEARCH_BACKEND="lunr" @@ -272,12 +269,8 @@ image:docs-latest: environment: name: registry/latest script: - - docker buildx build - --build-arg NANOC_ENV=${NANOC_ENV} - --build-arg CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME} - --tag $IMAGE_NAME - --file $DOCKERFILE . - --push + - docker build --build-arg NANOC_ENV=${NANOC_ENV} --build-arg CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME} -t $IMAGE_NAME -f $DOCKERFILE . + - docker push $IMAGE_NAME # # Test the GitLab docs latest Docker image if changes made to its Dockerfile @@ -292,7 +285,7 @@ test:image:docs-latest: DOCKERFILE: latest.Dockerfile needs: [] script: - - docker buildx build -t $IMAGE_NAME -f $DOCKERFILE . + - docker build -t $IMAGE_NAME -f $DOCKERFILE . - docker run --rm $IMAGE_NAME ls -l /usr/share/nginx/html # @@ -309,7 +302,8 @@ image:docs-archives: DOCKERFILE: dockerfiles/archives.Dockerfile needs: [] script: - - docker buildx build -t $IMAGE_NAME -f $DOCKERFILE . --push + - docker build -t $IMAGE_NAME -f $DOCKERFILE . + - docker push $IMAGE_NAME # # Test the GitLab docs archives Docker image if changes made to its Dockerfile @@ -324,7 +318,7 @@ test:image:docs-archives: DOCKERFILE: dockerfiles/archives.Dockerfile needs: [] script: - - docker buildx build -t $IMAGE_NAME -f $DOCKERFILE . + - docker build -t $IMAGE_NAME -f $DOCKERFILE . # # Build the image that is used for the gitlab-docs Workspace @@ -339,7 +333,8 @@ image:docs-workspace: IMAGE_NAME: $CI_REGISTRY_IMAGE/workspace DOCKERFILE: dockerfiles/gitlab-docs-workspace.Dockerfile script: - - docker buildx build --build-arg ASDF_VERSION=${ASDF_VERSION} -t $IMAGE_NAME -f $DOCKERFILE . --push + - docker build --build-arg ASDF_VERSION=${ASDF_VERSION} -t $IMAGE_NAME -f $DOCKERFILE . + - docker push $IMAGE_NAME # # Test the GitLab docs workspace Docker image if changes made to its Dockerfile @@ -353,7 +348,7 @@ test:image:docs-workspace: DOCKERFILE: dockerfiles/gitlab-docs-workspace.Dockerfile needs: [] script: - - docker buildx build --build-arg ASDF_VERSION=${ASDF_VERSION} -t $IMAGE_NAME -f $DOCKERFILE . + - docker build --build-arg ASDF_VERSION=${ASDF_VERSION} -t $IMAGE_NAME -f $DOCKERFILE . rules: - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Build docker images pipeline"' - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' diff --git a/dockerfiles/gitlab-docs-base.Dockerfile b/dockerfiles/gitlab-docs-base.Dockerfile index 36ef2218..ac1ec76f 100644 --- a/dockerfiles/gitlab-docs-base.Dockerfile +++ b/dockerfiles/gitlab-docs-base.Dockerfile @@ -8,7 +8,7 @@ ARG ALPINE_VERSION FROM ruby:${RUBY_VERSION}-alpine${ALPINE_VERSION} # Install dependencies -RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cache \ +RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cache -U \ bash \ build-base \ curl \ diff --git a/dockerfiles/gitlab-docs-lint-html.Dockerfile b/dockerfiles/gitlab-docs-lint-html.Dockerfile index b27a3c3e..1e59643c 100644 --- a/dockerfiles/gitlab-docs-lint-html.Dockerfile +++ b/dockerfiles/gitlab-docs-lint-html.Dockerfile @@ -7,7 +7,7 @@ ARG ALPINE_VERSION FROM ruby:${RUBY_VERSION}-alpine${ALPINE_VERSION} # Install dependencies -RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cache \ +RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cache -U \ bash \ build-base \ curl \ diff --git a/dockerfiles/gitlab-docs-lint-markdown.Dockerfile b/dockerfiles/gitlab-docs-lint-markdown.Dockerfile index a3fed56d..14b768e5 100644 --- a/dockerfiles/gitlab-docs-lint-markdown.Dockerfile +++ b/dockerfiles/gitlab-docs-lint-markdown.Dockerfile @@ -11,7 +11,7 @@ ARG MARKDOWNLINT_VERSION ARG MARKDOWNLINT2_VERSION # Install dependencies -RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cache \ +RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cache -U \ bash \ build-base \ curl \ diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile index 9d2f9253..29b82c25 100644 --- a/dockerfiles/single.Dockerfile +++ b/dockerfiles/single.Dockerfile @@ -17,7 +17,7 @@ ENV NANOC_ENV=$NANOC_ENV # Install Nanoc dependencies and tools that # are needed to build the docs site and run the tests. -RUN apk add --no-cache \ +RUN apk add --no-cache -U \ bash \ build-base \ curl \ |