Ensure /bin->/guix-builder/bin exists within the container
This commit is contained in:
parent
75361f9a8a
commit
d1b46ce129
|
@ -1 +1,2 @@
|
|||
*~
|
||||
*.tar.gz
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
FROM scratch
|
||||
FROM scratch as builder
|
||||
ADD guix-tarball-pack.tar.gz /guix-builder
|
||||
|
||||
ENV PATH=/guix-builder/bin
|
||||
ADD links.tar.gz /
|
||||
|
||||
VOLUME /var/guix/daemon-socket/socket /gnu/store /etc/ssl
|
||||
ENTRYPOINT ["/guix-builder/bin/bash"]
|
||||
|
|
10
Makefile
10
Makefile
|
@ -4,14 +4,20 @@ GUIX_MANIFEST := manifest.scm
|
|||
GUIX_MANIFEST_DEV := manifest-dev.scm
|
||||
|
||||
TARBALL ?= guix-tarball-pack.tar.gz
|
||||
LINKS_TARBALL ?= links.tar.gz
|
||||
IMAGE_TAG ?= guix-builder
|
||||
|
||||
$(LINKS_TARBALL):
|
||||
ln -s /guix-builder/bin bin
|
||||
tar -czvf links.tar.gz bin
|
||||
rm bin
|
||||
|
||||
$(TARBALL):
|
||||
@cp $$(guix pack -R -S /bin=bin -S /etc/ssl=etc/ssl -m $(GUIX_MANIFEST)) $@
|
||||
@chmod +w $@
|
||||
|
||||
.PHONY: build
|
||||
build: $(TARBALL)
|
||||
build: $(TARBALL) $(LINKS_TARBALL)
|
||||
@docker build -t $(IMAGE_TAG) .
|
||||
|
||||
.PHONY: run
|
||||
|
@ -30,4 +36,4 @@ shell:
|
|||
|
||||
.PHONY:
|
||||
clean:
|
||||
rm $(TARBALL)
|
||||
rm -r $(TARBALL) $(LINKS_TARBALL)
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
(specifications->manifest
|
||||
(list "make"
|
||||
"tar"
|
||||
"docker-cli"))
|
||||
|
|
Loading…
Reference in New Issue