mirrors/archlinux-docker
1
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/archlinux-docker.git synced 2025-08-07 14:47:14 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'zstd' into 'master'

Browse Source 
Replace xz with zstd

Closes #63

See merge request archlinux/archlinux-docker!61
This commit is contained in:
hashworks 2022-04-13 23:08:01 +00:00
commit 5380ff0684
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile.template
View File

@ -10,11 +10,13 @@
# allow us to automate the releaes process. # allow us to automate the releaes process.
FROM alpine:3.12 AS verify FROM alpine:3.12 AS verify
COPY TEMPLATE_ROOTFS_FILE / COPY TEMPLATE_ROOTFS_FILE /
RUN apk add --no-cache curl bash RUN apk add --no-cache curl tar zstd
SHELL ["/bin/bash", "-c"]
# TEMPLATE_ROOTFS_RELEASE_URL # TEMPLATE_ROOTFS_RELEASE_URL
RUN TEMPLATE_ROOTFS_DOWNLOAD && \ RUN TEMPLATE_ROOTFS_DOWNLOAD && \
sha256sum -c <<< "TEMPLATE_ROOTFS_HASH" && \ echo "TEMPLATE_ROOTFS_HASH" > /tmp/rootfs.tar.sha256 && \
cat /tmp/rootfs.tar.sha256 && \
sha256sum -c /tmp/rootfs.tar.sha256 && \
mkdir /rootfs && \ mkdir /rootfs && \
tar -C /rootfs --extract --file "${ROOTFS}" tar -C /rootfs --extract --file "${ROOTFS}"

18
Makefile
View File

@ -18,7 +18,7 @@ define rootfs
cp --recursive --preserve=timestamps --backup --suffix=.pacnew rootfs/* $(BUILDDIR)/ cp --recursive --preserve=timestamps --backup --suffix=.pacnew rootfs/* $(BUILDDIR)/
fakechroot -- fakeroot -- chroot $(BUILDDIR) update-ca-trust fakechroot -- fakeroot -- chroot $(BUILDDIR) update-ca-trust
fakechroot -- fakeroot -- chroot $(BUILDDIR) locale-gen fakechroot -- fakeroot -- chroot $(BUILDDIR) locale-gen
fakechroot -- fakeroot -- chroot $(BUILDDIR) sh -c 'pacman-key --init && pacman-key --populate archlinux && bash -c "rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pubring.gpg~,gnupg.S.}*"' fakechroot -- fakeroot -- chroot $(BUILDDIR) sh -c 'pacman-key --init && pacman-key --populate archlinux && bash -c "rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pubring.gpg~,gnupg.S.}*"'
@ -34,14 +34,14 @@ fakechroot -- fakeroot -- chroot $(BUILDDIR) update-ca-trust
# fixes #22 # fixes #22
fakeroot -- tar --numeric-owner --xattrs --acls --exclude-from=exclude -C $(BUILDDIR) -c . -f $(OUTPUTDIR)/$(1).tar fakeroot -- tar --numeric-owner --xattrs --acls --exclude-from=exclude -C $(BUILDDIR) -c . -f $(OUTPUTDIR)/$(1).tar
cd $(OUTPUTDIR); xz -9 -T0 -f $(1).tar; sha256sum $(1).tar.xz > $(1).tar.xz.SHA256 cd $(OUTPUTDIR); zstd --long -T0 -8 $(1).tar; sha256sum $(1).tar.zst > $(1).tar.zst.SHA256
endef endef
define dockerfile define dockerfile
sed -e "s|TEMPLATE_ROOTFS_FILE|$(1).tar.xz|" \ sed -e "s|TEMPLATE_ROOTFS_FILE|$(1).tar.zst|" \
-e "s|TEMPLATE_ROOTFS_RELEASE_URL|Local build|" \ -e "s|TEMPLATE_ROOTFS_RELEASE_URL|Local build|" \
-e "s|TEMPLATE_ROOTFS_DOWNLOAD|ROOTFS=\"$(1).tar.xz\"|" \ -e "s|TEMPLATE_ROOTFS_DOWNLOAD|ROOTFS=\"$(1).tar.zst\"|" \
-e "s|TEMPLATE_ROOTFS_HASH|$$(cat $(OUTPUTDIR)/$(1).tar.xz.SHA256)|" \ -e "s|TEMPLATE_ROOTFS_HASH|$$(cat $(OUTPUTDIR)/$(1).tar.zst.SHA256)|" \
Dockerfile.template > $(OUTPUTDIR)/Dockerfile.$(1) Dockerfile.template > $(OUTPUTDIR)/Dockerfile.$(1)
endef endef
@ -49,16 +49,16 @@ endef
clean: clean:
rm -rf $(BUILDDIR) $(OUTPUTDIR) rm -rf $(BUILDDIR) $(OUTPUTDIR)
$(OUTPUTDIR)/base.tar.xz: $(OUTPUTDIR)/base.tar.zst:
$(call rootfs,base,base) $(call rootfs,base,base)
$(OUTPUTDIR)/base-devel.tar.xz: $(OUTPUTDIR)/base-devel.tar.zst:
$(call rootfs,base-devel,base base-devel) $(call rootfs,base-devel,base base-devel)
$(OUTPUTDIR)/Dockerfile.base: $(OUTPUTDIR)/base.tar.xz $(OUTPUTDIR)/Dockerfile.base: $(OUTPUTDIR)/base.tar.zst
$(call dockerfile,base) $(call dockerfile,base)
$(OUTPUTDIR)/Dockerfile.base-devel: $(OUTPUTDIR)/base-devel.tar.xz $(OUTPUTDIR)/Dockerfile.base-devel: $(OUTPUTDIR)/base-devel.tar.zst
$(call dockerfile,base-devel) $(call dockerfile,base-devel)
.PHONY: docker-image-base .PHONY: docker-image-base