external true

bye
image
2022-10-03 20:23:36 +02:00 · 2022-10-03 20:21:49 +02:00 · 2022-10-03 20:18:46 +02:00 · 2022-10-03 20:16:31 +02:00 · 2022-10-03 19:45:44 +02:00 · 2022-10-03 19:40:51 +02:00
3 changed files with 9 additions and 27 deletions
@@ -4,8 +4,6 @@
 .vscode
 .DS_Store
 docker-compose*.yml
-.env
-.env.template

 # Back
 back/.DS_Store
@@ -19,4 +17,4 @@ var
 # Front
 front/.DS_Store
 front/node_modules/
-front/dist/
+front/dist/
@@ -7,8 +7,6 @@ services:
    restart: unless-stopped
    ports:
      - 3000:80
-    links:
-      - mysql:db
    depends_on:
      - mysql
    networks:
@@ -30,7 +28,6 @@ services:
    - ./var/mysql:/var/lib/mysql

  back:
-    image: numerisisep/numeris-back
    container_name: numeris_back
    restart: unless-stopped
    build:
@@ -41,33 +38,25 @@ services:
      - mysql
    env_file:
      - .env
-    volumes:
-      - .env:/home/numeris/.env
    depends_on:
-      - mysql
-    labels:
-      caddy: api.numeris-isep.fr
-      caddy.reverse_proxy: "{{upstreams 80}}"
-        # caddy.reverse_proxy.header_down: -Access-Control-Allow-Origin
+    - mysql

  front:
-    image: numerisisep/numeris-front
    container_name: numeris_front
    build:
      context: ./front
-      dockerfile: Dockerfile.production
+      dockerfile: Dockerfile
    networks:
      - caddy
+    depends_on:
+      - back
    labels:
      caddy: numeris-isep.fr
-      caddy.reverse_proxy: "{{upstreams 80}}"
-
+      caddy.reverse_proxy: "{{upstreams 4200}}"

  caddy:
    image: lucaslorentz/caddy-docker-proxy:ci-alpine
    restart: unless-stopped
-    environment:
-      CADDY_INGRESS_NETWORKS: caddy
    ports:
      - "80:80"
      - "443:443"
@@ -86,5 +75,4 @@ networks:
  mysql:

 volumes:
-  caddy_data:
  mysql:
@@ -4,7 +4,6 @@ services:
  phpmyadmin:
    image: phpmyadmin/phpmyadmin:latest
    container_name: numeris_phpmyadmin
-    restart: unless-stopped
    ports:
      - 3000:80
    links:
@@ -17,15 +16,13 @@ services:
  mysql:
    image: mysql:5.7
    container_name: numeris_mysql
-    restart: unless-stopped
    environment:
      MYSQL_DATABASE: 'numeris_testing'
      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'

  back:
-    image: numerisisep/numeris-back
+    image: numeris-back
    container_name: numeris_back
-    restart: unless-stopped
    build:
      context: ./back
      dockerfile: Dockerfile
@@ -44,14 +41,13 @@ services:
      - mysql

  front:
-    image: numerisisep/numeris-front
+    image: numeris-front
    container_name: numeris_front
-    restart: unless-stopped
    build:
      context: ./front
      dockerfile: Dockerfile
    ports:
-      - 8000:80
+      - 4200:4200
    links:
      - back
    depends_on:
Author	SHA1	Message	Date
marc	09f6858326	external true	2022-10-03 20:23:36 +02:00
marc	6d3fc1b774	bye	2022-10-03 20:21:49 +02:00
marc	326cce6fd8	image	2022-10-03 20:18:46 +02:00
marc	1f9a0b1bb9	var run docker	2022-10-03 20:16:31 +02:00
marc	4d6fe9941b	dash	2022-10-03 19:45:44 +02:00
marc	418de3d52d	fix conflict	2022-10-03 19:40:51 +02:00
marc	b7c51c7f3c	production	2022-09-21 16:48:27 +02:00
marc	6c60e3792c	image names even though they point towards nothing	2022-09-20 16:11:03 +02:00
marc	140fb1d7d8	3.9	2022-09-20 15:44:48 +02:00
marc	b54c69ae4c	names are back	2022-09-20 15:18:09 +02:00
marc	ce259181b9	mysql_testing	2022-09-20 14:38:33 +02:00
marc	77ca1911ed	bind mount is back	2022-09-20 14:36:31 +02:00
marc	5e3dfec004	phpmyadmin might come in handy	2022-09-19 10:32:09 +02:00
marc	b834f1d27b	fix names	2022-09-19 10:27:59 +02:00
marc	3a374a10bc	front too	2022-09-17 17:51:40 +02:00
marc	0378a0a224	front too	2022-09-16 19:54:08 +02:00
marc	a6b9888cfe	production	2022-09-16 19:06:08 +02:00
marc	8f69143715	3.9	2022-09-16 18:43:11 +02:00