From 823dbf6692808f5698b70ac335f6230b1aba6652 Mon Sep 17 00:00:00 2001
From: Schneider Roland <roland.schneider@extern.a1.at>
Date: Mon, 13 Jun 2022 11:21:03 +0200
Subject: [PATCH] improve docker build

---
 .../cutlergyor/apache2/create-image.sh        |  5 +-
 .../cutlergyor/apache2/docker-compose.yaml    | 52 +++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 environments/cutlergyor/apache2/docker-compose.yaml

diff --git a/environments/cutlergyor/apache2/create-image.sh b/environments/cutlergyor/apache2/create-image.sh
index 63cdd92..341a0c2 100644
--- a/environments/cutlergyor/apache2/create-image.sh
+++ b/environments/cutlergyor/apache2/create-image.sh
@@ -69,6 +69,7 @@ cp "$ARCHIVE_FILE_APP" "$DATA_DIR"
 
 echo "building image"
 cd "$START_DIR" || exit 1
-TAG_REMOTE=rocho02.ddns.net/admin/cutlergyor:"$VERSION"
-docker build --tag cutlergyor:"$VERSION" -t "$TAG_REMOTE" .
+TAG_REMOTE_CURRENT=rocho02.ddns.net/admin/cutlergyor:"$VERSION"
+TAG_REMOTE_LATEST=rocho02.ddns.net/admin/cutlergyor:latest
+docker build --tag cutlergyor:"$VERSION" -t "$TAG_REMOTE_CURRENT"  -t "$TAG_REMOTE_LATEST" .
 docker push "$TAG_REMOTE"
diff --git a/environments/cutlergyor/apache2/docker-compose.yaml b/environments/cutlergyor/apache2/docker-compose.yaml
new file mode 100644
index 0000000..87544c6
--- /dev/null
+++ b/environments/cutlergyor/apache2/docker-compose.yaml
@@ -0,0 +1,52 @@
+version: '3'
+services:
+
+  cutlerweb:
+    image: rocho02.ddns.net/admin/cutlergyor:latest
+    container_name: web
+    networks:
+      cutler_network:
+    ports:
+      - "42001:80"
+      - "42002:443"
+    volumes:
+      - cutler_letsencrypt:/etc/letsencrypt
+      - cutler_photos:/var/www/html/cutler/frontend/web/uploads/profile
+    environment:
+      FITNESS_DB_HOST: cutler_db
+      FITNESS_DB_NAME: cutler_prod2
+      FITNESS_DB_PORT:
+      FITNESS_DB_USERNAME: cutler_prod
+      FITNESS_DB_PASSWORD: cutler_prod
+      FITNESS_MAIL_HOST: cutlermail
+      FITNESS_MAIL_PORT: 1025
+      FITNESS_MAIL_USERNAME:
+      FITNESS_MAIL_PASSWORD:
+
+  cutlerdb:
+    image: mariadb:10.1
+    container_name: db
+    networks:
+      cutler_network:
+    volumes:
+      - cutler_mariadb:/var/lib/mysql
+    environment:
+      MARIADB_ROOT_PASSWORD: cutler
+      MARIADB_DATABASE: cutler_prod2
+      MARIADB_USER: cutler_prod
+      MARIADB_PASSWORD: cutler_prod
+
+  cutlermail:
+    container_name: mail
+    image: reachfive/fake-smtp-server
+    networks:
+      cutler_network:
+
+volumes:
+  cuter_photos:
+  cutler_letsencrypt:
+  cutler_mariadb:
+
+networks:
+  cutler_network:
+