Merge branch 'docker-compose' into php7.4+github-action+docker-compose

.github/workflows/docker-build-test.yml

@@ -1,4 +1,4 @@
-name: Docker
+name: Docker build test
 
 on:
   push:
@@ -13,7 +13,7 @@ on:
   pull_request:
 
 jobs:
-  build:
+  build-back:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -29,3 +29,20 @@ jobs:
 
     - name: Build
       run: docker-compose -f docker-compose.production.yml build back
+
+  build-front:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Fake env file
+      run: touch .env
+
+    - name: Build
+      run: docker-compose -f docker-compose.production.yml build front

.github/workflows/docker.yml

@@ -1,6 +1,8 @@
 name: Docker
 
 on:
+  schedule:
+  - cron: "0 4 * * 0" # run every sunday at 4 am to test if the image builds correctly given that changes of debian or compose packages can break the image
   push:
     branches:
       - "master"

docker-compose.production.yml

@@ -20,15 +20,22 @@ services:
     - mysql:/var/lib/mysql
 
   back:
+    restart: unless-stopped
     build:
       context: ./back
       dockerfile: Dockerfile
     env_file:
       - .env
-    links:
-    - mysql
     depends_on:
     - mysql
 
+  front:
+    build:
+      context: ./front
+      dockerfile: Dockerfile
+    depends_on:
+      - back
+    entrypoint: ng s --host 0.0.0.0
+
 volumes:
   mysql:

docker-compose.testing.yml

@@ -1,14 +1,25 @@
 version: '3'
 services:
 
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin:latest
+    container_name: numeris_phpmyadmin
+    ports:
+      - 3000:80
+    links:
+      - mysql:db
+    depends_on:
+      - 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:
+    container_name: numeris_back
     build:
       context: ./back
       dockerfile: Dockerfile
@@ -25,4 +36,15 @@ services:
       - mysql
     depends_on:
       - mysql
-    container_name: numeris_back
+
+  front:
+    container_name: numeris_front
+    build:
+      context: ./front
+      dockerfile: Dockerfile
+    ports:
+      - 4200:4200
+    links:
+      - back
+    depends_on:
+      - back