rekahsoft
/
guix-builder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure /bin->/guix-builder/bin exists within the container

This commit is contained in:
Collin J. Doering 2023-12-28 20:55:50 -05:00
parent 75361f9a8a
commit d1b46ce129
Signed by: rekahsoft
GPG Key ID: 7B4DEB93212B3022
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
*~
*.tar.gz *.tar.gz

5
Dockerfile
View File

@ -1,7 +1,6 @@
FROM scratch FROM scratch as builder
ADD guix-tarball-pack.tar.gz /guix-builder ADD guix-tarball-pack.tar.gz /guix-builder
ADD links.tar.gz /
ENV PATH=/guix-builder/bin
VOLUME /var/guix/daemon-socket/socket /gnu/store /etc/ssl VOLUME /var/guix/daemon-socket/socket /gnu/store /etc/ssl
ENTRYPOINT ["/guix-builder/bin/bash"] ENTRYPOINT ["/guix-builder/bin/bash"]

10
Makefile
View File

@ -4,14 +4,20 @@ GUIX_MANIFEST := manifest.scm
GUIX_MANIFEST_DEV := manifest-dev.scm GUIX_MANIFEST_DEV := manifest-dev.scm
TARBALL ?= guix-tarball-pack.tar.gz TARBALL ?= guix-tarball-pack.tar.gz
LINKS_TARBALL ?= links.tar.gz
IMAGE_TAG ?= guix-builder IMAGE_TAG ?= guix-builder
$(LINKS_TARBALL):
ln -s /guix-builder/bin bin
tar -czvf links.tar.gz bin
rm bin
$(TARBALL): $(TARBALL):
@cp $$(guix pack -R -S /bin=bin -S /etc/ssl=etc/ssl -m $(GUIX_MANIFEST)) $@ @cp $$(guix pack -R -S /bin=bin -S /etc/ssl=etc/ssl -m $(GUIX_MANIFEST)) $@
@chmod +w $@ @chmod +w $@
.PHONY: build .PHONY: build
build: $(TARBALL) build: $(TARBALL) $(LINKS_TARBALL)
@docker build -t $(IMAGE_TAG) . @docker build -t $(IMAGE_TAG) .
.PHONY: run .PHONY: run
@ -30,4 +36,4 @@ shell:
.PHONY: .PHONY:
clean: clean:
rm $(TARBALL) rm -r $(TARBALL) $(LINKS_TARBALL)

1
manifest-dev.scm
View File

@ -1,3 +1,4 @@
(specifications->manifest (specifications->manifest
(list "make" (list "make"
"tar"
"docker-cli")) "docker-cli"))