From dd2fe76f592fe06be898105af78c7c39e9723278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me>
Date: Thu, 1 Jun 2023 17:58:50 +0200
Subject: [PATCH] Containers => Replace bind mount by copy (for deployment from
external server)
---
Dockerfile_Dojo_Database | 4 ++++
Dockerfile_Dojo_Proxy | 9 +++++++++
docker-compose.yml | 12 ++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 Dockerfile_Dojo_Database
create mode 100644 Dockerfile_Dojo_Proxy
diff --git a/Dockerfile_Dojo_Database b/Dockerfile_Dojo_Database
new file mode 100644
index 0000000..9e9c606
--- /dev/null
+++ b/Dockerfile_Dojo_Database
@@ -0,0 +1,4 @@
+FROM mariadb:10.11
+LABEL maintainer="Michaël Minelli <michael-jean.minelli@hesge.ch>"
+
+ADD Database/docker-entrypoint-initdb.d/ /docker-entrypoint-initdb.d/
\ No newline at end of file
diff --git a/Dockerfile_Dojo_Proxy b/Dockerfile_Dojo_Proxy
new file mode 100644
index 0000000..990dbeb
--- /dev/null
+++ b/Dockerfile_Dojo_Proxy
@@ -0,0 +1,9 @@
+FROM nginx:alpine
+LABEL maintainer="Michaël Minelli <michael-jean.minelli@hesge.ch>"
+
+## Copy our default nginx config
+ADD Proxy/certs/ /dojo/certs/
+ADD Proxy/default.conf /etc/nginx/conf.d/
+
+EXPOSE 80
+EXPOSE 443
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index a43bc51..284287e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,9 @@ version: '3.8'
services:
dojo-database:
container_name: dojo-database
- image: mariadb:10.11
+ build:
+ context: ./
+ dockerfile: Dockerfile_Dojo_Database
environment:
MARIADB_DATABASE: '${DATABASE_NAME}'
MARIADB_ROOT_PASSWORD: '${DATABASE_ROOT_PASSWORD}'
@@ -14,7 +16,6 @@ services:
- dojo-database
volumes:
- dojo-database:/var/lib/mysql
- - ./Database/docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d/
restart: always
adminer:
@@ -62,11 +63,10 @@ services:
dojo-proxy:
container_name: dojo-proxy
- image: nginx:alpine
+ build:
+ context: ./
+ dockerfile: Dockerfile_Dojo_Proxy
restart: 'always'
- volumes:
- - ./Proxy/certs/:/dojo/certs/
- - ./Proxy/default.conf:/etc/nginx/conf.d/default.conf
networks:
dojo-network:
aliases:
--
GitLab