Compare commits

..
3 Commits
Author SHA1 Message Date
marc 46f79cbe9f pls ignore .env files 2022-10-12 10:55:41 +02:00
marc 4942daea62 all env files 2022-09-28 16:32:39 +02:00
marc 0cf2367cbe ignoring env file when building image 2022-09-28 16:30:05 +02:00
3 changed files with 29 additions and 89 deletions
+3 -1
View File
@@ -4,6 +4,8 @@
.vscode
.DS_Store
docker-compose*.yml
.env
.env.template
# Back
back/.DS_Store
@@ -17,4 +19,4 @@ var
# Front
front/.DS_Store
front/node_modules/
front/dist/
front/dist/
+23 -59
View File
@@ -1,78 +1,42 @@
version: "3.9"
version: '3'
services:
phpmyadmin:
image: phpmyadmin/phpmyadmin:latest
container_name: numeris_phpmyadmin
restart: unless-stopped
ports:
- 3000:80
links:
- mysql:db
depends_on:
- mysql
networks:
caddy:
labels:
caddy: phpmyadmin.numeris-isep.fr
caddy.reverse_proxy: "{{upstreams 80}}"
container_name: numeris_phpmyadmin
mysql:
image: mysql:5.7
container_name: numeris_mysql
restart: unless-stopped
env_file:
- .env
environment:
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
MYSQL_DATABASE: 'numeris'
volumes:
- ./var/mysql:/var/lib/mysql
container_name: numeris_mysql
back:
container_name: numeris_back
restart: unless-stopped
build:
context: ./back
dockerfile: Dockerfile
env_file:
- .env
dockerfile: Dockerfile.production
environment:
APP_ENV: production
APP_DEBUG: 'false'
DB_CONNECTION: mysql
DB_HOST: ${DB_HOST}
DB_PORT: ${DB_PORT}
DB_DATABASE: ${DB_DATABASE}
DB_USERNAME: ${DB_USERNAME}
DB_PASSWORD: ${DB_PASSWORD}
ports:
- ${BACK_PORT}:80
links:
- mysql
depends_on:
- mysql
networks:
caddy:
labels:
caddy: api.numeris-isep.fr
caddy.reverse_proxy: "{{upstreams 8080}}"
front:
container_name: numeris_front
build:
context: ./front
dockerfile: Dockerfile
depends_on:
- back
networks:
caddy:
labels:
caddy: numeris-isep.fr
caddy.reverse_proxy: "{{upstreams 4200}}"
caddy:
image: marcpartensky/caddy
restart: unless-stopped
ports:
- "80:80"
- "443:443"
environment:
CADDY_INGRESS_NETWORKS: caddy
volumes:
# docker rootless daemon socket https://docs.docker.com/engine/security/rootless/
- /run/user/1000/docker.sock:/var/run/docker.sock
- caddy_data:/data
networks:
caddy:
healthcheck:
test: ["CMD", "curl", "-f", "localhost:80"]
networks:
caddy:
volumes:
caddy_data:
mysql:
container_name: numeris_back
+3 -29
View File
@@ -1,28 +1,14 @@
version: "3.9"
version: '3'
services:
phpmyadmin:
image: phpmyadmin/phpmyadmin:latest
container_name: numeris_phpmyadmin
ports:
- 3000:80
links:
- mysql:db
depends_on:
- mysql
volumes:
- ./var/mysql_testing:/var/lib/mysql
mysql:
image: mysql:5.7
container_name: numeris_mysql
environment:
MYSQL_DATABASE: 'numeris_testing'
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
container_name: numeris_mysql
back:
image: numeris-back
container_name: numeris_back
build:
context: ./back
dockerfile: Dockerfile
@@ -39,16 +25,4 @@ services:
- mysql
depends_on:
- mysql
front:
image: numeris-front
container_name: numeris_front
build:
context: ./front
dockerfile: Dockerfile
ports:
- 4200:4200
links:
- back
depends_on:
- back
container_name: numeris_back