baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Mount podman socket itself directly

Browse source 
Signed-off-by: baalajimaestro <me@baalajimaestro.me>
This commit is contained in:
baalajimaestro 2022-12-08 23:09:12 +05:30
parent ab4ec9a63a
commit 9703c87f28
Signed by: baalajimaestro
GPG key ID: F93C394FE9BBAFD5
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -4,7 +4,6 @@ docker-build:
before_script: before_script:
- dnf -y install git make - dnf -y install git make
- sed -i 's/short-name-mode="enforcing"/short-name-mode="permissive"/g' /etc/containers/registries.conf - 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 - ln -s /usr/bin/podman /usr/bin/docker
- echo "$DOCKER_PASSWORD" | podman login -u "$DOCKER_USERNAME" registry.baalajimaestro.me --password-stdin - echo "$DOCKER_PASSWORD" | podman login -u "$DOCKER_USERNAME" registry.baalajimaestro.me --password-stdin
variables: variables:

2
Makefile
View file

@ -11,7 +11,7 @@ TRAEFIK_DEV_IMAGE := traefik-dev$(if $(GIT_BRANCH),:$(subst /,-,$(GIT_BRANCH)))
REPONAME := $(shell echo $(REPO) | tr '[:upper:]' '[:lower:]') REPONAME := $(shell echo $(REPO) | tr '[:upper:]' '[:lower:]')
TRAEFIK_IMAGE := $(if $(REPONAME),$(REPONAME),"traefik/traefik") 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)",) DOCKER_BUILD_ARGS := $(if $(DOCKER_VERSION), "--build-arg=DOCKER_VERSION=$(DOCKER_VERSION)",)
# only used when running in docker # only used when running in docker