Dockerfile: remove spdx-licenses-list

Including a copy in void-packages turned out better solution.
Grep in image don't have required perl regexps, and getting
one that have make linting slower by order of magnitude.
Even if it was already there, simply using image is
unnecessarily slower.

This reverts commit 163a923529.
This commit is contained in:
Piotr Wójcik 2020-05-08 22:17:26 +02:00 committed by Michael Aldridge
parent 31df80c341
commit fc40e50ff9
2 changed files with 2 additions and 3 deletions

View File

@ -17,7 +17,6 @@ FROM scratch as stage1
ARG REPOSITORY=https://alpha.de.repo.voidlinux.org
ARG ARCH=x86_64
ARG BASEPKG=base-minimal
ARG ADDINS=
COPY --from=stage0 /target /
COPY keys/* /target/var/db/xbps/keys/
RUN xbps-reconfigure -a && \
@ -26,7 +25,7 @@ RUN xbps-reconfigure -a && \
--repository=${REPOSITORY}/current \
--repository=${REPOSITORY}/current/musl \
-r /target \
${BASEPKG} ${ADDINS}
${BASEPKG}
# 3) configure and clean up the final image
FROM scratch

View File

@ -99,6 +99,6 @@ masterdir-all-print:
masterdir-all: $(ALL_MASTERDIRS)
masterdir-%:
$(SUDO) docker build --build-arg REPOSITORY=$(XBPS_REPOSITORY) --build-arg ARCH=$* --build-arg ADDINS=spdx-licenses-list -t voidlinux/masterdir-$*:$(DATECODE) .
$(SUDO) docker build --build-arg REPOSITORY=$(XBPS_REPOSITORY) --build-arg ARCH=$* -t voidlinux/masterdir-$*:$(DATECODE) .
.PHONY: clean dist rootfs-all-print rootfs-all platformfs-all-print platformfs-all pxe-all-print pxe-all masterdir-all-print masterdir-all masterdir-push-all