From 163a923529da258d838ac6cf355aa98f3ed7b6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Jun 2019 22:46:13 +0200
Subject: [PATCH] Dockerfile: include spdx-licenses-list

This is for linting license field on Travis.

One can also customize image as simple as
docker build "--build-arg=ADDINS=moreutils jq"
---
 Dockerfile | 3 ++-
 Makefile   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ea91666..027d89f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,7 @@ 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 && \
@@ -25,7 +26,7 @@ RUN xbps-reconfigure -a && \
     --repository=${REPOSITORY}/current \
     --repository=${REPOSITORY}/current/musl \
     -r /target \
-    ${BASEPKG}
+    ${BASEPKG} ${ADDINS}
 
 # 3) configure and clean up the final image
 FROM scratch
diff --git a/Makefile b/Makefile
index 4d80243..debacde 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,6 @@ masterdir-all-print:
 masterdir-all: $(ALL_MASTERDIRS)
 
 masterdir-%:
-	$(SUDO) docker build --build-arg REPOSITORY=$(XBPS_REPOSITORY) --build-arg ARCH=$* -t voidlinux/masterdir-$*:$(DATECODE) .
+	$(SUDO) docker build --build-arg REPOSITORY=$(XBPS_REPOSITORY) --build-arg ARCH=$* --build-arg ADDINS=spdx-licenses-list -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