Browse Source

Makefile: remove masterdir docker infrastructure

this has been moved to void-linux/void-docker for some time now
classabbyamp 2 years ago
parent
commit
b53cb28dce
2 changed files with 1 additions and 49 deletions
  1. 0 36
      Dockerfile
  2. 1 13
      Makefile

+ 0 - 36
Dockerfile

@@ -1,36 +0,0 @@
-# 1) use alpine to generate a void environment
-FROM alpine:3.12 as stage0
-ARG REPOSITORY=https://repo-default.voidlinux.org
-ARG ARCH=x86_64
-COPY keys/* /target/var/db/xbps/keys/
-RUN apk add ca-certificates curl && \
-  curl ${REPOSITORY}/static/xbps-static-latest.$(uname -m)-musl.tar.xz | \
-    tar Jx && \
-  XBPS_ARCH=${ARCH} xbps-install.static -yMU \
-    --repository=${REPOSITORY}/current \
-    --repository=${REPOSITORY}/current/musl \
-    -r /target \
-    base-minimal
-
-# 2) using void to generate the final build
-FROM scratch as stage1
-ARG REPOSITORY=https://repo-default.voidlinux.org
-ARG ARCH=x86_64
-ARG BASEPKG=base-minimal
-COPY --from=stage0 /target /
-COPY keys/* /target/var/db/xbps/keys/
-RUN xbps-reconfigure -a && \
-  mkdir -p /target/var/cache && ln -s /var/cache/xbps /target/var/cache/xbps && \
-  XBPS_ARCH=${ARCH} xbps-install -yMU \
-    --repository=${REPOSITORY}/current \
-    --repository=${REPOSITORY}/current/musl \
-    -r /target \
-    ${BASEPKG}
-
-# 3) configure and clean up the final image
-FROM scratch
-COPY --from=stage1 /target /
-RUN xbps-reconfigure -a && \
-  rm -r /var/cache/xbps
-
-CMD ["/bin/sh"]

+ 1 - 13
Makefile

@@ -13,21 +13,17 @@ T_CLOUD_IMGS=GCP{,-musl}
 
 T_PXE_ARCHS=x86_64{,-musl}
 
-T_MASTERDIRS=x86_64{,-musl} i686
-
 ARCHS=$(shell echo $(T_ARCHS))
 PLATFORMS=$(shell echo $(T_PLATFORMS))
 SBC_IMGS=$(shell echo $(T_SBC_IMGS))
 CLOUD_IMGS=$(shell echo $(T_CLOUD_IMGS))
 PXE_ARCHS=$(shell echo $(T_PXE_ARCHS))
-MASTERDIRS=$(shell echo $(T_MASTERDIRS))
 
 ALL_ROOTFS=$(foreach arch,$(ARCHS),void-$(arch)-ROOTFS-$(DATECODE).tar.xz)
 ALL_PLATFORMFS=$(foreach platform,$(PLATFORMS),void-$(platform)-PLATFORMFS-$(DATECODE).tar.xz)
 ALL_SBC_IMAGES=$(foreach platform,$(SBC_IMGS),void-$(platform)-$(DATECODE).img.xz)
 ALL_CLOUD_IMAGES=$(foreach cloud,$(CLOUD_IMGS),void-$(cloud)-$(DATECODE).tar.gz)
 ALL_PXE_ARCHS=$(foreach arch,$(PXE_ARCHS),void-$(arch)-NETBOOT-$(DATECODE).tar.gz)
-ALL_MASTERDIRS=$(foreach arch,$(MASTERDIRS), masterdir-$(arch))
 
 SUDO := sudo
 
@@ -93,12 +89,4 @@ pxe-all-print:
 void-%-NETBOOT-$(DATECODE).tar.gz: $(SCRIPTS) void-%-ROOTFS-$(DATECODE).tar.xz
 	$(SUDO) ./mknet.sh void-$*-ROOTFS-$(DATECODE).tar.xz
 
-masterdir-all-print:
-	@echo $(ALL_MASTERDIRS) | sed "s: :\n:g"
-
-masterdir-all: $(ALL_MASTERDIRS)
-
-masterdir-%:
-	$(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