From 42c96ef915aadfed9a4b99148120b4a79bfd54ac Mon Sep 17 00:00:00 2001
From: Arnie <i@cechis.cz>
Date: Fri, 10 Aug 2018 10:16:47 +0200
Subject: [PATCH] Update adminer and dev proxy

---
 adminer/Makefile | 30 ++++++++++++++++++++++++++++++
 adminer/run.sh   |  4 ++--
 dev-proxy/run.sh |  4 ++--
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 adminer/Makefile

diff --git a/adminer/Makefile b/adminer/Makefile
new file mode 100644
index 0000000..fd20ce2
--- /dev/null
+++ b/adminer/Makefile
@@ -0,0 +1,30 @@
+DOCKER_REGISTRY := dr.ys-dev.cz
+DOCKER_PUBLIC_REGISTRY := yoursystemcz
+APP_NAME := adminer
+
+IMAGE_NAME := adminer
+
+LATEST_VERSION := 4.6.2
+
+all: build release
+.PHONY: all
+
+version/$(LATEST_VERSION): IMAGE_VERSION=$(LATEST_VERSION)
+version/4.5: IMAGE_VERSION=4.5
+version/4.4: IMAGE_VERSION=4.4
+version/4.3.1: IMAGE_VERSION=4.3.1
+
+version/%:
+	docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):$* --build-arg "IMAGE_NAME=$(IMAGE_NAME)" --build-arg "IMAGE_VERSION=$(IMAGE_VERSION)" .
+version/4.6.2-clue:
+	docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):4.6.2-clue --build-arg "IMAGE_NAME=clue/adminer" --build-arg "IMAGE_VERSION=latest" .
+
+release/%:
+	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$* $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
+	docker push $(DOCKER_REGISTRY)/$(APP_NAME):$*
+	docker push $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
+
+
+build: version/$(LATEST_VERSION) version/4.5 version/4.4 version/4.3.1 version/4.6.2-clue
+
+release: release/$(LATEST_VERSION) release/4.5 release/4.4 release/4.3.1 release/4.6.2-clue
diff --git a/adminer/run.sh b/adminer/run.sh
index 8c3e8c3..de7a319 100755
--- a/adminer/run.sh
+++ b/adminer/run.sh
@@ -2,8 +2,8 @@
 
 SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
-IMAGE_NAME="adminer"
-IMAGE_VERSION="4.6.2"
+IMAGE_NAME="yoursystemcz/adminer"
+IMAGE_VERSION="4.6.2-clue"
 
 SERVICE_NAME=adminer
 
diff --git a/dev-proxy/run.sh b/dev-proxy/run.sh
index c331865..0c329d2 100755
--- a/dev-proxy/run.sh
+++ b/dev-proxy/run.sh
@@ -29,8 +29,8 @@ init() {
 		-v dev-proxy:/root/.caddy \
 		--restart=unless-stopped \
 		-p 80:80 \
-		-p 443:443 \
-		-p 2015:2015 \
+		-p 127.0.0.1:443:443 \
+		-p 127.0.0.1:2015:2015 \
 		--net ${PROXY_NETWORK} \
 		${IMAGE_NAME}:${IMAGE_VERSION}