mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/void-linux/void-mklive

Browse Source
This commit is contained in:
root 2020-05-09 21:27:18 -07:00
commit 37c9885ae2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

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

2
Makefile
View File

@ -99,6 +99,6 @@ masterdir-all-print:
masterdir-all: $(ALL_MASTERDIRS) masterdir-all: $(ALL_MASTERDIRS)
masterdir-%: 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 .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