Resolve merge conflicts

# Conflicts:
#   .gitlab-ci.yml

.gitlab-ci.yml

@@ -2,55 +2,40 @@ stages:
   - build
   - application-test
 
-consentProvider_image:
+consent-provider:
   stage: build
-  variables:
-    DOCKER_DRIVER: overlay2
-  image: docker:stable
-  services:
-    - docker:18-dind  # FIXME This is an older version of DIND. Update when gitlab-runner fixes https://gitlab.com/gitlab-org/gitlab-runner/issues/4501
-  before_script:
-    - docker info
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
   script:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build -t ${CI_REGISTRY_IMAGE}/consent_provider:${CI_COMMIT_REF_NAME} consent_provider/
-    - docker push ${CI_REGISTRY_IMAGE}/consent_provider:${CI_COMMIT_REF_NAME}
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context ${CI_PROJECT_DIR}/consent_provider --dockerfile ${CI_PROJECT_DIR}/consent_provider/Dockerfile --destination $CI_REGISTRY_IMAGE/consent_provider:${CI_COMMIT_REF_NAME}
   only:
     changes:
       - consent_provider/**/*
       - .gitlab-ci.yml
 
-loginProvider_image:
+login-provider:
   stage: build
-  variables:
-    DOCKER_DRIVER: overlay2
-  image: docker:stable
-  services:
-    - docker:18-dind  # FIXME This is an older version of DIND. Update when gitlab-runner fixes https://gitlab.com/gitlab-org/gitlab-runner/issues/4501
-  before_script:
-    - docker info
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
   script:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build -t ${CI_REGISTRY_IMAGE}/login_provider:${CI_COMMIT_REF_NAME} login_provider/
-    - docker push ${CI_REGISTRY_IMAGE}/login_provider:${CI_COMMIT_REF_NAME}
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context ${CI_PROJECT_DIR}/login_provider --dockerfile ${CI_PROJECT_DIR}/login_provider/Dockerfile --destination $CI_REGISTRY_IMAGE/login_provider:${CI_COMMIT_REF_NAME}
   only:
     changes:
       - login_provider/**/*
       - .gitlab-ci.yml
 
-loginProviderCiTest_image:
+login-provider-test:
   stage: build
-  variables:
-    DOCKER_DRIVER: overlay2
-  image: docker:stable
-  services:
-    - docker:18-dind  # FIXME This is an older version of DIND. Update when gitlab-runner fixes https://gitlab.com/gitlab-org/gitlab-runner/issues/4501
-  before_script:
-    - docker info
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
   script:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build -t ${CI_REGISTRY_IMAGE}/login_provider_ci_test:${CI_COMMIT_REF_NAME} login_provider/test/
-    - docker push ${CI_REGISTRY_IMAGE}/login_provider_ci_test:${CI_COMMIT_REF_NAME}
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context ${CI_PROJECT_DIR}/login_provider/test --dockerfile ${CI_PROJECT_DIR}/login_provider/test/Dockerfile --destination $CI_REGISTRY_IMAGE/login_provider_ci_test:${CI_COMMIT_REF_NAME}
   only:
     changes:
       - login_provider/**/*