usind docker to build container

simonschoening · Apr 26, 2021 · dc57117 · dc57117
1 parent 4caeaf2
commit dc57117
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -9,27 +9,26 @@ variables:
   DOCKER_FILE: Dockerfile
   DOCKER_TAG: latest
   DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}
+  IMAGE: ${CI_REGISTRY_IMAGE}
   GIT_SUBMODULE_STRATEGY: normal
   FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
 
 .prepare:docker: &prepare_docker
   stage: prepare
   image:
-    name: quay.io/buildah/stable
+    name: docker
   variables:
     _BUILDAH_STARTED_IN_USERNS: ""
     BUILDAH_ISOLATION: chroot
     BUILDAH_LAYERS: "true"
   before_script:
-  - buildah version
-  - buildah login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
+  - docker version
+  - docker login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
   script:
-  - buildah bud -f ${DOCKER_FILE} -t ${DOCKER_IMAGE}:${DOCKER_TAG} .
-  - buildah push ${DOCKER_IMAGE}:${DOCKER_TAG} docker://${DOCKER_IMAGE}:${DOCKER_TAG}
-  after_script:
-  - buildah logout "${CI_REGISTRY}"
+  - docker build -f ${DOCKER_FILE} -t ${DOCKER_IMAGE}:${DOCKER_TAG} .
+  - docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
   tags:
-  - builder
+  - docker
 
 prepare:docker:
   <<: *prepare_docker