From 0d117c1a37358531f4168b81653bd5521c9ee924 Mon Sep 17 00:00:00 2001
From: David Mehren <git@herrmehren.de>
Date: Sat, 15 Jan 2022 22:30:27 +0100
Subject: [PATCH] Build with Docker
---
.gitlab-ci.yml | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec19d18..0809a87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,37 +1,39 @@
-image:
- name: gcr.io/kaniko-project/executor:debug
- entrypoint: [""]
+image: docker:latest
+
+variables:
+ DOCKER_HOST: tcp://docker:2376
+ DOCKER_TLS_CERTDIR: ""
+ DOCKER_DRIVER: overlay2
+
+services:
+ - docker:dind
before_script:
- - mkdir -p /kaniko/.docker
- - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- - source $CI_PROJECT_DIR/environment
+ - docker infog
+ - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
build-main:
script:
- - /kaniko/executor
- --snapshotMode=redo
+ - docker build
--build-arg LDAP_PLUGIN_URL="${LDAP_PLUGIN_URL}"
--build-arg TEXLIVE_IMAGE="${TEXLIVE_IMAGE}"
--build-arg login_text="${LOGIN_TEXT}"
--build-arg collab_text="${COLLAB_TEXT}"
- --context $CI_PROJECT_DIR
- --dockerfile $CI_PROJECT_DIR/Dockerfile
- --destination "$CI_REGISTRY_IMAGE"
- --destination "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
+ --tag "$CI_REGISTRY_IMAGE"
+ --tag "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" .
+ - docker push "$CI_REGISTRY_IMAGE"
+ - docker push "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
only:
- main
build:
script:
- - /kaniko/executor
- --snapshotMode=redo
+ - docker build
--build-arg LDAP_PLUGIN_URL="${LDAP_PLUGIN_URL}"
--build-arg TEXLIVE_IMAGE="${TEXLIVE_IMAGE}"
--build-arg login_text="${LOGIN_TEXT}"
--build-arg collab_text="${COLLAB_TEXT}"
- --context $CI_PROJECT_DIR
- --dockerfile $CI_PROJECT_DIR/Dockerfile
- --destination "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+ --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+ - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
except:
- main
--
GitLab