Skip to content

Commit cdc2d0b

Browse files
NDaffernIBMGitHub Enterprise
authored andcommitted
Set VOLUME_MOUNT_OPTIONS for macOS at top of makefile or it is not executed (#290)
Signed-off-by: Nicholas-Daffern <Nicholas.Daffern@ibm.com>
1 parent 4a66728 commit cdc2d0b

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,13 @@ ifeq ($(shell [ ! -z $(TRAVIS) ] && [ "$(TRAVIS_PULL_REQUEST)" = "false" ] && [
178178
MQ_MANIFEST_TAG_SUFFIX=.$(TIMESTAMPFLAT).$(GIT_COMMIT)
179179
endif
180180

181+
# Make sure we don't use VOLUME_MOUNT_OPTIONS for Podman on macOS
182+
ifeq "$(COMMAND)" "podman"
183+
ifeq "$(shell uname -s)" "Darwin"
184+
VOLUME_MOUNT_OPTIONS:=
185+
endif
186+
endif
187+
181188
PATH_TO_MQ_TAG_CACHE=$(TRAVIS_BUILD_DIR)/.tagcache
182189
ifneq "$(TRAVIS)" "$(EMPTY)"
183190
ifneq ("$(wildcard $(PATH_TO_MQ_TAG_CACHE))","")
@@ -382,13 +389,6 @@ define build-mq-docker
382389
$(call build-mq-using-web-server,$1,$2,$3,$4,$5)
383390
endef
384391

385-
# Make sure we don't use VOLUME_MOUNT_OPTIONS for Podman on macOS
386-
ifeq "$(COMMAND)" "podman"
387-
ifeq "$(shell uname -s)" "Darwin"
388-
VOLUME_MOUNT_OPTIONS:=
389-
endif
390-
endif
391-
392392
# When building with Podman on macOS (Darwin), use the web server build because you can't use bind-mounted volumes with `podman build` on macOS
393393
# Args: imageName, imageTag, dockerfile, mqArchive, dockerfileTarget
394394
define build-mq-podman-Darwin

0 commit comments

Comments
 (0)