fablab-nea/labsync
1
0
Fork 0
Code Issues 11 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Merge docker images

Browse source
This commit is contained in:
jalr 2018-03-17 23:50:42 +01:00
parent 73e65f0500
commit 1cb4ca513c
7 changed files with 105 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Makefile
View file

@ -2,8 +2,7 @@ PACKER_VERSION ?= 1.2.0
ANNOUNCE ?= http://10.2.2.1:6969/announce
WEBSEED ?= http://10.2.2.1
PACKER_DOCKER_IMAGE ?= labsync-packer
MKTORRENT_DOCKER_IMAGE ?= labsync-mktorrent
DOCKER_IMAGE ?= labsync-builder
CWD=$(abspath $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
@ -27,7 +26,7 @@ fi \
)
.PHONY: default
default: dockerimg images/debian-stretch.squashfs images/debian-stretch.torrent
default: dockerimg images/debian-stretch.squashfs
.PHONY: clean
clean:
@ -36,8 +35,7 @@ clean:
.PHONY: dockerimg
dockerimg:
docker build -t "$(PACKER_DOCKER_IMAGE)" --build-arg "PACKER_VERSION=$(PACKER_VERSION)" packer/docker
docker build -t "$(MKTORRENT_DOCKER_IMAGE)" mktorrent
docker build -t "$(DOCKER_IMAGE)" --build-arg "PACKER_VERSION=$(PACKER_VERSION)" docker
images:
[ ! -d "$@" ] && mkdir "$@"
@ -51,19 +49,22 @@ images/debian-stretch.squashfs: images
-v "${PWD}/images:/images" \
-e "user=`id -u`" \
-e "group=`id -g`" \
"$(PACKER_DOCKER_IMAGE)" \
-e "ANNOUNCE=$(ANNOUNCE)" \
-e "WEBSEED=$(WEBSEED)" \
"$(DOCKER_IMAGE)" \
debian-stretch
images/debian-stretch.torrent: images
docker run \
--rm \
-v "${PWD}/images:/workdir" \
-v "${PWD}/images:/images" \
-e "user=`id -u`" \
-e "group=`id -g`" \
-e "ANNOUNCE=$(ANNOUNCE)" \
-e "WEBSEED=$(WEBSEED)" \
"$(MKTORRENT_DOCKER_IMAGE)" \
debian-stretch.squashfs
-e "TASK=torrent" \
"$(DOCKER_IMAGE)" \
debian-stretch
# updates the initramfs
# only used for development