Convert into single docker image, change volume structure etc

Makefile inconsistent!
This commit is contained in:
2018-02-23 10:17:37 +01:00
parent 8c4f64cf96
commit 06437ac0b8
14 changed files with 104 additions and 161 deletions

View File

@@ -1,6 +1,7 @@
default: buildall
VOLUME ?= cloner-test
GLOBALVOL ?= cloner-global
TAGOWNER = valicek1
TAGMAIN = repo-cloner
TAGBASE= $(TAGOWNER)/$(TAGMAIN)
@@ -8,12 +9,18 @@ TAGBASE= $(TAGOWNER)/$(TAGMAIN)
buildall: mirror creator launcher
# Mirrorer - root of repo
mirror:
docker build -t $(TAGBASE)-mirror .
cloner:
docker build -t $(TAGBASE) .
run: cloner
docker run -v $(GLOBALVOL):/data -it --rm $(TAGBASE)
run-once: cloner
docker run -v $(GLOBALVOL):/data -it --rm --user=executor $(TAGBASE) /usr/local/bin/cron-command
run-bash: cloner
docker run -v $(GLOBALVOL):/data -it --rm $(TAGBASE) /bin/bash
run-mirror: mirror
docker run -v $(VOLUME):/data -it --rm $(TAGBASE)-mirror
# Creator - ./creator-image dir
creator:
@@ -22,17 +29,8 @@ creator:
run-creator: creator
docker run -v /var/run/docker.sock:/var/run/docker.sock -it --rm $(TAGBASE)-creator
# Launcher - ./launcher-image
launcher:
docker build -t $(TAGBASE)-launcher ./launcher-image
run-launcher: launcher
docker run -e JOBS=4 -v /var/run/docker.sock:/var/run/docker.sock -it --rm $(TAGBASE)-launcher
run-launcher-detached: launcher
docker run -e JOBS=8 -v /var/run/docker.sock:/var/run/docker.sock -itd --rm $(TAGBASE)-launcher
# wizzard
# auth dir could be executable (to list)
wizzard: mirror run-creator
# CI Detector