Create the required podman socket
Signed-off-by: baalajimaestro <me@baalajimaestro.me>
This commit is contained in:
parent
9703c87f28
commit
06c025a6d4
2 changed files with 3 additions and 1 deletions
|
@ -5,6 +5,8 @@ docker-build:
|
||||||
- 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 /usr/bin/podman /usr/bin/docker
|
- 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
|
- echo "$DOCKER_PASSWORD" | podman login -u "$DOCKER_USERNAME" registry.baalajimaestro.me --password-stdin
|
||||||
variables:
|
variables:
|
||||||
GO111MODULE: "on"
|
GO111MODULE: "on"
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -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/podman/podman.sock:/var/run/docker.sock")
|
INTEGRATION_OPTS := $(if $(MAKE_DOCKER_HOST),-e "DOCKER_HOST=$(MAKE_DOCKER_HOST)",-v "/var/run/docker.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
|
||||||
|
|
Loading…
Reference in a new issue