Skip to content

Commit 130aac3

Browse files
author
Joe Doss
committed
Add support for Podman in Makefile.
1 parent a446512 commit 130aac3

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

Makefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ GOOS_OVERRIDE ?=
1010
OUTPUT_ROOT=output/
1111
RELEASE=./.releases
1212

13+
DOCKER_HOST ?= /var/run/docker.sock
14+
DOCKER_SOCK := $(if $(filter unix://%,$(DOCKER_HOST)),$(patsubst unix://%,%,$(DOCKER_HOST)),$(DOCKER_HOST))
15+
1316
#########################################
1417
# Default
1518
#########################################
@@ -118,8 +121,8 @@ release-dev:
118121
-e GORELEASER_KEY=${GORELEASER_KEY} \
119122
-e IS_PRERELEASE=true \
120123
--entrypoint /bin/bash \
121-
-v /var/run/docker.sock:/var/run/docker.sock \
122-
-v `pwd`:/go/src/$(PKG) \
124+
-v $(DOCKER_SOCK):/var/run/docker.sock:Z \
125+
-v `pwd`:/go/src/$(PKG):Z \
123126
-w /go/src/$(PKG) \
124127
ghcr.io/goreleaser/goreleaser-cross-pro:${GOLANG_CROSS_VERSION}
125128

@@ -129,8 +132,8 @@ release-dry-run:
129132
-e GPG_PRIVATE_KEY_FILE=/dev/null \
130133
-e IS_PRERELEASE=true \
131134
--entrypoint /go/src/$(PKG)/docker/build/entrypoint.sh \
132-
-v /var/run/docker.sock:/var/run/docker.sock \
133-
-v `pwd`:/go/src/$(PKG) \
135+
-v $(DOCKER_SOCK):/var/run/docker.sock:Z \
136+
-v `pwd`:/go/src/$(PKG):Z \
134137
-w /go/src/$(PKG) \
135138
ghcr.io/goreleaser/goreleaser-cross-pro:${GOLANG_CROSS_VERSION} \
136139
--clean --skip=validate --skip=sign --prepare
@@ -144,8 +147,9 @@ release:
144147
-e GORELEASER_KEY=${GORELEASER_KEY} \
145148
-e ${GPG_PRIVATE_KEY_FILE}=${GPG_PRIVATE_KEY_FILE} \
146149
--entrypoint /go/src/$(PKG)/docker/build/entrypoint.sh \
147-
-v /var/run/docker.sock:/var/run/docker.sock \
148-
-v `pwd`:/go/src/$(PKG) \
150+
-v ${GPG_PRIVATE_KEY_FILE}:${GPG_PRIVATE_KEY_FILE}:Z \
151+
-v $(DOCKER_SOCK):/var/run/docker.sock:Z \
152+
-v `pwd`:/go/src/$(PKG):Z \
149153
-w /go/src/$(PKG) \
150154
ghcr.io/goreleaser/goreleaser-cross-pro:${GOLANG_CROSS_VERSION} \
151155
release --clean --prepare

0 commit comments

Comments
 (0)