Compare commits
2 Commits
735222139a
...
f646927e9a
Author | SHA1 | Date |
---|---|---|
Collin J. Doering | f646927e9a | |
Collin J. Doering | 8176119556 |
|
@ -11,4 +11,4 @@ ENV PROOT_TMP_DIR=/tmp/proot
|
||||||
RUN rm /tmp/proot/delete-me
|
RUN rm /tmp/proot/delete-me
|
||||||
|
|
||||||
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"]
|
CMD ["/guix-builder/bin/bash"]
|
||||||
|
|
20
Makefile
20
Makefile
|
@ -6,7 +6,12 @@ GUIX_MANIFEST_DEV := manifest-dev.scm
|
||||||
TARBALL ?= guix-tarball-pack.tar.gz
|
TARBALL ?= guix-tarball-pack.tar.gz
|
||||||
LINKS_TARBALL ?= links.tar.gz
|
LINKS_TARBALL ?= links.tar.gz
|
||||||
PASSWD_FILE ?= passwd
|
PASSWD_FILE ?= passwd
|
||||||
IMAGE_TAG ?= guix-builder
|
|
||||||
|
OCI_REGISTRY ?= docker-local.nexus.home.rekahsoft.ca
|
||||||
|
IMAGE_NAME ?= guix-builder
|
||||||
|
IMAGE_TAG ?= latest
|
||||||
|
LOCAL_IMAGE_NAME := $(IMAGE_NAME):$(IMAGE_TAG)
|
||||||
|
PUSH_IMAGE_NAME := $(OCI_REGISTRY)/$(LOCAL_IMAGE_NAME)
|
||||||
|
|
||||||
$(PASSWD_FILE):
|
$(PASSWD_FILE):
|
||||||
echo 'root:x:0:0:root:/root:/bin/sh' > passwd
|
echo 'root:x:0:0:root:/root:/bin/sh' > passwd
|
||||||
|
@ -30,7 +35,7 @@ pre-build: $(TARBALL) $(LINKS_TARBALL) $(PASSWD_FILE)
|
||||||
|
|
||||||
.PHONY: build
|
.PHONY: build
|
||||||
build: pre-build
|
build: pre-build
|
||||||
@docker build -t $(IMAGE_TAG) .
|
@docker build -t $(IMAGE_NAME) .
|
||||||
|
|
||||||
.PHONY: run
|
.PHONY: run
|
||||||
run: build
|
run: build
|
||||||
|
@ -38,16 +43,21 @@ run: build
|
||||||
-v /var/guix/daemon-socket/socket:/var/guix/daemon-socket/socket \
|
-v /var/guix/daemon-socket/socket:/var/guix/daemon-socket/socket \
|
||||||
-v /gnu/store:/gnu/store:ro \
|
-v /gnu/store:/gnu/store:ro \
|
||||||
-v /etc/ssl:/etc/ssl:ro \
|
-v /etc/ssl:/etc/ssl:ro \
|
||||||
$(IMAGE_TAG):latest
|
$(IMAGE_NAME):latest
|
||||||
|
|
||||||
.PHONY: run-no-store
|
.PHONY: run-no-store
|
||||||
run-no-store: build
|
run-no-store: build
|
||||||
@docker run --rm -it $(IMAGE_TAG):latest
|
@docker run --rm -it $(IMAGE_NAME):latest
|
||||||
|
|
||||||
.PHONY: shell
|
.PHONY: shell
|
||||||
shell:
|
shell:
|
||||||
@./shell.sh $(GUIX_MANIFEST) $(GUIX_MANIFEST_DEV)
|
@./shell.sh $(GUIX_MANIFEST) $(GUIX_MANIFEST_DEV)
|
||||||
|
|
||||||
.PHONY:
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
rm -r $(TARBALL) $(LINKS_TARBALL) $(PASSWD_FILE)
|
rm -r $(TARBALL) $(LINKS_TARBALL) $(PASSWD_FILE)
|
||||||
|
|
||||||
|
.PHONY: deploy
|
||||||
|
deploy:
|
||||||
|
docker tag $(IMAGE_NAME) $(PUSH_IMAGE_NAME)
|
||||||
|
docker push $(PUSH_IMAGE_NAME)
|
||||||
|
|
Loading…
Reference in New Issue