summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2019-10-05 07:26:37 +0200
committerSuren A. Chilingaryan <csa@suren.me>2019-10-05 07:26:37 +0200
commitf18d78bb5330bf8916f9785cea22a74dcc1531c9 (patch)
treea72c4ffb336ab38817644c237bca77575dd78653
parent5374bef630025b10478f0c234b4e37fc29b3be93 (diff)
downloadadei-f18d78bb5330bf8916f9785cea22a74dcc1531c9.tar.gz
adei-f18d78bb5330bf8916f9785cea22a74dcc1531c9.tar.bz2
adei-f18d78bb5330bf8916f9785cea22a74dcc1531c9.tar.xz
adei-f18d78bb5330bf8916f9785cea22a74dcc1531c9.zip
Reorganize make procedure for adei-mini
-rw-r--r--adei-mini/Makefile20
-rwxr-xr-xadei-mini/files/docker-entrypoint.sh14
-rwxr-xr-xadei-mini/files/openshift-entrypoint.sh17
-rw-r--r--adei/Dockerfile.mini (renamed from adei-mini/Dockerfile)0
-rw-r--r--adei/Makefile24
5 files changed, 21 insertions, 54 deletions
diff --git a/adei-mini/Makefile b/adei-mini/Makefile
deleted file mode 100644
index ba30242..0000000
--- a/adei-mini/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-all: build
-install: push
-
-.PHONY: deps rebuild build push start stop restart bash
-
-deps:
- docker pull chsa/microadei:latest
-
-build: deps Dockerfile
- docker build --tag chsa/adei-minimal:latest .
-# docker build --squash --tag chsa/adei-minimal-squashed:latest .
-
-rebuild: Dockerfile
- docker build --no-cache --tag chsa/adei-minimal:latest .
-
-push: build
- docker push chsa/adei-minimal:latest
-
-bash: build
- docker exec -it adei-minimal /bin/bash
diff --git a/adei-mini/files/docker-entrypoint.sh b/adei-mini/files/docker-entrypoint.sh
deleted file mode 100755
index 6f0fa88..0000000
--- a/adei-mini/files/docker-entrypoint.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-set -e
-
-mkdir -p /adei/{src,cfg,tmp,sys,log}
-
-if ! whoami &> /dev/null; then
- if [ -w /etc/passwd ]; then
- echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
- fi
-fi
-
-echo "Running: $@"
-exec "$@"
diff --git a/adei-mini/files/openshift-entrypoint.sh b/adei-mini/files/openshift-entrypoint.sh
deleted file mode 100755
index 9353b5d..0000000
--- a/adei-mini/files/openshift-entrypoint.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/bash
-
-mkdir -p /adei/{src,cfg,tmp,sys,log}
-
-
-while [ ! -f /adei/cfg/.ready ]; do
- echo "Waiting for ADEI intialization..."
- sleep 5
-done
-
-while [ ! -f "$1" ]; do
- echo "The script $1 is not populated yet. Waiting...."
- sleep 1
-done
-
-echo "Running: $@"
-exec /bin/bash "$@"
diff --git a/adei-mini/Dockerfile b/adei/Dockerfile.mini
index 4845c18..4845c18 100644
--- a/adei-mini/Dockerfile
+++ b/adei/Dockerfile.mini
diff --git a/adei/Makefile b/adei/Makefile
index eb40411..1a88f6f 100644
--- a/adei/Makefile
+++ b/adei/Makefile
@@ -1,7 +1,25 @@
-all: build
-install: push
+all: build build-mini
+mini: build-mini
+install: push push-mini
+install-mini: push-mini
-.PHONY: rebuild build push start stop restart bash
+.PHONY: rebuild build push start stop restart bash mini install-mini deps-mini build-mini rebuild-mini push-mini bash-mini
+
+deps-mini:
+ docker pull chsa/microadei:latest
+
+build-mini: deps-mini Dockerfile.mini
+ docker build -f Dockerfile.mini --tag chsa/adei-minimal:latest .
+# docker build -f Dockerfile.mini --tag chsa/adei-minimal-squashed:latest --squash .
+
+rebuild-mini: deps-mini Dockerfile.mini
+ docker build -f Dockerfile.mini --tag chsa/adei-minimal:lates --no-cache .
+
+push-mini: build-mini
+ docker push chsa/adei-minimal:latest
+
+bash-mini: build-mini
+ docker exec -it adei-minimal /bin/bash
build: Dockerfile
docker build --tag chsa/adei:latest .