Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit cd431fd

Browse files
committed
rpm/Makefile: remove parameterization of Dockerfile
All images used are multi-arch now, so no need to parameterize Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 06ff3c2) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 38461b5a0dc6751660c63833108dc637cf70d949 Component: packaging
1 parent 0cca4f4 commit cd431fd

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

components/packaging/rpm/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)-buster
1010
GEN_RPM_VER=$(shell ./gen-rpm-ver $(CLI_DIR) $(VERSION))
1111
CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown
1212

13-
DOCKERFILE=Dockerfile
14-
ifdef NEEDS_ARCH_SPECIFIC
15-
DOCKERFILE=Dockerfile.$(ARCH)
16-
endif
1713
ifdef BUILD_IMAGE
1814
BUILD_IMAGE_FLAG=--build-arg $(BUILD_IMAGE)
1915
endif
@@ -22,7 +18,7 @@ BUILD?=DOCKER_BUILDKIT=1 \
2218
$(BUILD_IMAGE_FLAG) \
2319
--build-arg GO_IMAGE=$(GO_IMAGE) \
2420
-t rpmbuild-$@/$(ARCH) \
25-
-f $@/$(DOCKERFILE) \
21+
-f $@/Dockerfile \
2622
.
2723

2824
SPEC_FILES?=docker-ce.spec docker-ce-cli.spec

0 commit comments

Comments
 (0)