From 81b6097351c14e190a655b2963675f544e9c9714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Val=C3=AD=C4=8Dek=20=28YCNet=29?=
 <hppro@swamp.ga>
Date: Fri, 23 Feb 2018 10:23:06 +0100
Subject: [PATCH] Merged wizzard

---
 Dockerfile                                    |  2 +-
 Makefile                                      | 22 +++----------------
 creator-image/Dockerfile                      |  9 --------
 creator-image/entrypoint => dockerbin/wizzard |  0
 4 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 creator-image/Dockerfile
 rename creator-image/entrypoint => dockerbin/wizzard (100%)

diff --git a/Dockerfile b/Dockerfile
index 8dbe285..bb6e789 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:edge
 
 VOLUME /data
 
-RUN apk add --no-cache git bash openssh parallel shadow ; \
+RUN apk add --no-cache git bash openssh parallel openssh-keygen vim shadow ; \
 	useradd -ms /bin/bash executor ; \
 	chown executor:executor /data ; \
 	echo "*	*	*	*	*	/usr/local/bin/cron-command" >> /etc/crontabs/executor ; \
diff --git a/Makefile b/Makefile
index d08208a..efe111d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,10 @@
-default: buildall
+default: cloner
 
-VOLUME ?= cloner-test
 GLOBALVOL ?= cloner-global
 TAGOWNER = valicek1
 TAGMAIN = repo-cloner
 TAGBASE= $(TAGOWNER)/$(TAGMAIN)
 
-
-buildall: mirror creator launcher
-
 cloner:
 	docker build -t $(TAGBASE) .
 
@@ -21,19 +17,7 @@ run-once: cloner
 run-bash: cloner
 	docker run -v $(GLOBALVOL):/data -it --rm $(TAGBASE) /bin/bash
 
-
-# Creator - ./creator-image dir
-creator:
-	docker build -t $(TAGBASE)-creator ./creator-image
-
-run-creator: creator
-	docker run -v /var/run/docker.sock:/var/run/docker.sock -it --rm $(TAGBASE)-creator
-
 # wizzard
-# auth dir could be executable (to list)
-wizzard: mirror run-creator 
+wizzard: cloner
+	docker run -v $(GLOBALVOL):/data -it --rm $(TAGBASE) /usr/local/bin/wizzard
 
-# CI Detector
-detector: 
-	docker build -t cloner-mirror-dev .
-	docker run -it --rm  -v tester-gitt:/data cloner-mirror-dev 
diff --git a/creator-image/Dockerfile b/creator-image/Dockerfile
deleted file mode 100644
index f2be50b..0000000
--- a/creator-image/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# Alpine base image
-FROM alpine:edge
-
-RUN apk add --no-cache bash docker openssh-keygen vim
-
-ADD entrypoint /bin/
-
-CMD [ "/bin/entrypoint" ]
-
diff --git a/creator-image/entrypoint b/dockerbin/wizzard
similarity index 100%
rename from creator-image/entrypoint
rename to dockerbin/wizzard