From 9703c87f28812eb57d2aba8a9667aad12635d991 Mon Sep 17 00:00:00 2001 From: baalajimaestro Date: Thu, 8 Dec 2022 23:09:12 +0530 Subject: [PATCH] Mount podman socket itself directly Signed-off-by: baalajimaestro --- .gitlab-ci.yml | 1 - Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88d4bedb9..430e4abde 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ docker-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 /var/run/podman/podman.sock /var/run/docker.sock - ln -s /usr/bin/podman /usr/bin/docker - echo "$DOCKER_PASSWORD" | podman login -u "$DOCKER_USERNAME" registry.baalajimaestro.me --password-stdin variables: diff --git a/Makefile b/Makefile index 0c957b003..43839d0ee 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ TRAEFIK_DEV_IMAGE := traefik-dev$(if $(GIT_BRANCH),:$(subst /,-,$(GIT_BRANCH))) REPONAME := $(shell echo $(REPO) | tr '[:upper:]' '[:lower:]') TRAEFIK_IMAGE := $(if $(REPONAME),$(REPONAME),"traefik/traefik") -INTEGRATION_OPTS := $(if $(MAKE_DOCKER_HOST),-e "DOCKER_HOST=$(MAKE_DOCKER_HOST)",-v "/var/run/docker.sock:/var/run/docker.sock") +INTEGRATION_OPTS := $(if $(MAKE_DOCKER_HOST),-e "DOCKER_HOST=$(MAKE_DOCKER_HOST)",-v "/var/run/podman/podman.sock:/var/run/docker.sock") DOCKER_BUILD_ARGS := $(if $(DOCKER_VERSION), "--build-arg=DOCKER_VERSION=$(DOCKER_VERSION)",) # only used when running in docker