From 09c4b955635800cdd16e23cec612bef61dbe52cd Mon Sep 17 00:00:00 2001 From: stam Date: Thu, 3 Jun 2021 00:29:57 +0300 Subject: [PATCH] epicmorg edge migrated to new config --- linux/epicmorg/edge/jdk11/Makefile | 8 ++++---- linux/epicmorg/edge/jdk11/docker-compose.yml | 6 ++++++ linux/epicmorg/edge/jdk6/Makefile | 8 ++++---- linux/epicmorg/edge/jdk6/docker-compose.yml | 6 ++++++ linux/epicmorg/edge/jdk7/Makefile | 8 ++++---- linux/epicmorg/edge/jdk7/docker-compose.yml | 6 ++++++ linux/epicmorg/edge/jdk8/Makefile | 8 ++++---- linux/epicmorg/edge/jdk8/docker-compose.yml | 6 ++++++ linux/epicmorg/edge/main/Makefile | 8 ++++---- linux/epicmorg/edge/main/docker-compose.yml | 6 ++++++ 10 files changed, 50 insertions(+), 20 deletions(-) create mode 100644 linux/epicmorg/edge/jdk11/docker-compose.yml create mode 100644 linux/epicmorg/edge/jdk6/docker-compose.yml create mode 100644 linux/epicmorg/edge/jdk7/docker-compose.yml create mode 100644 linux/epicmorg/edge/jdk8/docker-compose.yml create mode 100644 linux/epicmorg/edge/main/docker-compose.yml diff --git a/linux/epicmorg/edge/jdk11/Makefile b/linux/epicmorg/edge/jdk11/Makefile index 1bcad05b2..82c5a2de6 100644 --- a/linux/epicmorg/edge/jdk11/Makefile +++ b/linux/epicmorg/edge/jdk11/Makefile @@ -1,5 +1,5 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/edge:jdk11 . - docker push epicmorg/edge:jdk11 +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/epicmorg/edge/jdk11/docker-compose.yml b/linux/epicmorg/edge/jdk11/docker-compose.yml new file mode 100644 index 000000000..8e3c49f5c --- /dev/null +++ b/linux/epicmorg/edge/jdk11/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/edge:jdk11" + build: + context: . diff --git a/linux/epicmorg/edge/jdk6/Makefile b/linux/epicmorg/edge/jdk6/Makefile index d02c51767..82c5a2de6 100644 --- a/linux/epicmorg/edge/jdk6/Makefile +++ b/linux/epicmorg/edge/jdk6/Makefile @@ -1,5 +1,5 @@ -all: emgprod -emgprod: - docker build --compress -t epicmorg/edge:jdk6 . - docker push epicmorg/edge:jdk6 +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/epicmorg/edge/jdk6/docker-compose.yml b/linux/epicmorg/edge/jdk6/docker-compose.yml new file mode 100644 index 000000000..be02b2e6c --- /dev/null +++ b/linux/epicmorg/edge/jdk6/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/edge:jdk6" + build: + context: . diff --git a/linux/epicmorg/edge/jdk7/Makefile b/linux/epicmorg/edge/jdk7/Makefile index ca513d304..82c5a2de6 100644 --- a/linux/epicmorg/edge/jdk7/Makefile +++ b/linux/epicmorg/edge/jdk7/Makefile @@ -1,5 +1,5 @@ -all: emgprod -emgprod: - docker build --compress -t epicmorg/edge:jdk7 . - docker push epicmorg/edge:jdk7 +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/epicmorg/edge/jdk7/docker-compose.yml b/linux/epicmorg/edge/jdk7/docker-compose.yml new file mode 100644 index 000000000..f28c0e686 --- /dev/null +++ b/linux/epicmorg/edge/jdk7/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/edge:jdk7" + build: + context: . diff --git a/linux/epicmorg/edge/jdk8/Makefile b/linux/epicmorg/edge/jdk8/Makefile index 6a17f6dc8..82c5a2de6 100644 --- a/linux/epicmorg/edge/jdk8/Makefile +++ b/linux/epicmorg/edge/jdk8/Makefile @@ -1,5 +1,5 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/edge:jdk8 . - docker push epicmorg/edge:jdk8 +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/epicmorg/edge/jdk8/docker-compose.yml b/linux/epicmorg/edge/jdk8/docker-compose.yml new file mode 100644 index 000000000..62509c1d6 --- /dev/null +++ b/linux/epicmorg/edge/jdk8/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/edge:jdk8" + build: + context: . diff --git a/linux/epicmorg/edge/main/Makefile b/linux/epicmorg/edge/main/Makefile index c44f1d984..82c5a2de6 100644 --- a/linux/epicmorg/edge/main/Makefile +++ b/linux/epicmorg/edge/main/Makefile @@ -1,5 +1,5 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/edge . - docker push epicmorg/edge +all: app +app: + docker-compose build --compress + docker-compose push diff --git a/linux/epicmorg/edge/main/docker-compose.yml b/linux/epicmorg/edge/main/docker-compose.yml new file mode 100644 index 000000000..68eb65396 --- /dev/null +++ b/linux/epicmorg/edge/main/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/edge:latest" + build: + context: .