From fc287f97f7062a12ac4fbadd270b1144af145e7a Mon Sep 17 00:00:00 2001 From: baalajimaestro Date: Thu, 8 Dec 2022 23:41:55 +0530 Subject: [PATCH] Revert "Mount podman socket itself directly" This reverts commit 9703c87f28812eb57d2aba8a9667aad12635d991. Revert "Make the socker available on /var/run/docker.sock as well" This reverts commit 3b0519f50e22ae987af4f2811d6a6f9c09e16079. Revert "Dont enforce short name resolution" This reverts commit 7f2f2abd2cf4b4079e957da10712999171897f0a. Revert "Attempt using podman for building image" This reverts commit 730c4c3d326bff6daeaf629d1a36b6b8408af6f7. Signed-off-by: baalajimaestro --- .gitlab-ci.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fb5fe451..9134964f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,13 @@ docker-build: - image: quay.io/podman/stable:latest + image: docker:dind stage: build before_script: - - dnf -y install git make - - sed -i 's/short-name-mode="enforcing"/short-name-mode="permissive"/g' /etc/containers/registries.conf - - ln -s /usr/bin/podman /usr/bin/docker - - podman system service --time 0 unix://var/run/podman/podman.sock & - - ln -s /var/run/podman/podman.sock /var/run/docker.sock - - echo "$DOCKER_PASSWORD" | podman login -u "$DOCKER_USERNAME" registry.baalajimaestro.me --password-stdin + - apk add make git + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" registry.baalajimaestro.me --password-stdin variables: GO111MODULE: "on" GOPATH: "/root/go" script: - make build-image - - podman tag traefik/traefik registry.baalajimaestro.me/baalajimaestro/traefik:latest - - podman push registry.baalajimaestro.me/baalajimaestro/traefik:latest + - docker tag traefik/traefik registry.baalajimaestro.me/baalajimaestro/traefik:latest + - docker push registry.baalajimaestro.me/baalajimaestro/traefik:latest