Skip to content

Commit fc40e50

Browse files
Chocimierthe-maldridge
authored andcommitted
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 163a923.
1 parent 31df80c commit fc40e50

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ FROM scratch as stage1
1717
ARG REPOSITORY=https://alpha.de.repo.voidlinux.org
1818
ARG ARCH=x86_64
1919
ARG BASEPKG=base-minimal
20-
ARG ADDINS=
2120
COPY --from=stage0 /target /
2221
COPY keys/* /target/var/db/xbps/keys/
2322
RUN xbps-reconfigure -a && \
@@ -26,7 +25,7 @@ RUN xbps-reconfigure -a && \
2625
--repository=${REPOSITORY}/current \
2726
--repository=${REPOSITORY}/current/musl \
2827
-r /target \
29-
${BASEPKG} ${ADDINS}
28+
${BASEPKG}
3029

3130
# 3) configure and clean up the final image
3231
FROM scratch

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,6 @@ masterdir-all-print:
9999
masterdir-all: $(ALL_MASTERDIRS)
100100

101101
masterdir-%:
102-
$(SUDO) docker build --build-arg REPOSITORY=$(XBPS_REPOSITORY) --build-arg ARCH=$* --build-arg ADDINS=spdx-licenses-list -t voidlinux/masterdir-$*:$(DATECODE) .
102+
$(SUDO) docker build --build-arg REPOSITORY=$(XBPS_REPOSITORY) --build-arg ARCH=$* -t voidlinux/masterdir-$*:$(DATECODE) .
103103

104104
.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

0 commit comments

Comments
 (0)