removing the conditional - just forcing --pull/--no-cache all the time
This commit is contained in:
parent
76d0853864
commit
0af67168a9
14
Makefile
14
Makefile
|
@ -115,16 +115,10 @@ $(CONTAINER_DOTFILES):
|
||||||
$(DKR) build --platform $(OS)/$(ARCH) -t $(REGISTRY)/$(BIN):$(TAG) \
|
$(DKR) build --platform $(OS)/$(ARCH) -t $(REGISTRY)/$(BIN):$(TAG) \
|
||||||
-f .dockerfile-$(BIN)-$(OS)_$(ARCH) .; \
|
-f .dockerfile-$(BIN)-$(OS)_$(ARCH) .; \
|
||||||
else \
|
else \
|
||||||
if [ "$(HOSTARCH)" = "$(ARCH)" ]; then \
|
$(DKR) build --pull --no-cache \
|
||||||
$(DKR) build -t $(REGISTRY)/$(BIN):$(TAG) \
|
-t $(REGISTRY)/$(BIN):$(TAG) -f .dockerfile-$(BIN)-$(OS)_$(ARCH) \
|
||||||
-f .dockerfile-$(BIN)-$(OS)_$(ARCH) .; \
|
--platform $(OS)/$(ARCH) \
|
||||||
else \
|
. ; \
|
||||||
echo "Building for different architecture: forcing pull/no-cache"; \
|
|
||||||
$(DKR) build --pull --no-cache \
|
|
||||||
-t $(REGISTRY)/$(BIN):$(TAG) -f .dockerfile-$(BIN)-$(OS)_$(ARCH) \
|
|
||||||
--platform $(OS)/$(ARCH) \
|
|
||||||
. ; \
|
|
||||||
fi; \
|
|
||||||
fi
|
fi
|
||||||
@$(DKR) images -q $(REGISTRY)/$(BIN):$(TAG) > $@
|
@$(DKR) images -q $(REGISTRY)/$(BIN):$(TAG) > $@
|
||||||
@echo
|
@echo
|
||||||
|
|
Loading…
Reference in New Issue
Block a user