good names

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

@@ -1,48 +0,0 @@
-name: Docker build test
-
-on:
-  push:
-    branches:
-      - "*"
-      - "!master"
-    # Publish `v1.2.3` tags as releases.
-    tags:
-      - v*
-
-  # Run tests for any PRs.
-  pull_request:
-
-jobs:
-  build-back:
-    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 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/prod.yml

@@ -1,8 +1,6 @@
-name: Docker
+name: Deploy production
 
 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"
@@ -10,9 +8,6 @@ on:
     tags:
       - v*
 
-  # Run tests for any PRs.
-  pull_request:
-
 jobs:
   build-front:
     name: Build front
@@ -38,7 +33,9 @@ jobs:
         context: front
         dockerfile: Dockerfile
         push: true
-        tags: numerisisep/numeris-front:latest
+        tags: numerisisep/numeris-front:prod
+        cache-from: type=gha
+        cache-to: type=gha
 
   build-back:
     name: Build back
@@ -64,7 +61,9 @@ jobs:
         context: back
         dockerfile: Dockerfile.production
         push: true
-        tags: numerisisep/numeris-back:latest
+        tags: numerisisep/numeris-back:prod
+        cache-from: type=gha
+        cache-to: type=gha
 
 
   pull-and-recreate:
@@ -85,5 +84,5 @@ jobs:
         script: |
           cd numeris
           git pull
-          docker-compose -f docker-compose.production.yml pull
-          docker-compose -f docker-compose.production.yml up -d --force-recreate
+          docker-compose -f docker-compose.infra.yml pull
+          docker-compose -f docker-compose.infra.yml up -d --force-recreate

.github/workflows/staging.yml

@@ -0,0 +1,86 @@
+name: Deploy staging
+
+on:
+  push:
+    branches:
+      - "staging"
+    tags:
+      - v*
+
+jobs:
+  build-front:
+    name: 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: Login to DockerHub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build and push front
+      uses: docker/build-push-action@v3
+      with:
+        context: front
+        dockerfile: Dockerfile
+        push: true
+        tags: numerisisep/numeris-front:staging
+        cache-from: type=gha
+        cache-to: type=gha
+
+  build-back:
+    name: Build back
+    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: Login to DockerHub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build and push back
+      uses: docker/build-push-action@v3
+      with:
+        context: back
+        dockerfile: Dockerfile.production
+        push: true
+        tags: numerisisep/numeris-back:staging
+        cache-from: type=gha
+        cache-to: type=gha
+
+  pull-and-recreate:
+    name: Pull and recreate
+    needs:
+      - build-front
+      - build-back
+    runs-on: ubuntu-latest
+    steps:
+    - name: executing remote ssh commands using password
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USERNAME }}
+          # password: ${{ secrets.PASSWORD }}
+        key: ${{ secrets.KEY }}
+        port: ${{ secrets.PORT }}
+        script: |
+          cd numeris
+          git pull
+          docker-compose -f docker-compose.infra.yml pull
+          docker-compose -f docker-compose.infra.yml up -d --force-recreate

.github/workflows/test.yml

@@ -0,0 +1,111 @@
+name: Test docker build
+
+on:
+  push:
+    branches:
+      - "*"
+      - "!master"
+      - "!staging"
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+  # Run tests for any PRs.
+  pull_request:
+
+jobs:
+  back-prod:
+    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 back prod
+      uses: docker/build-push-action@v3
+      with:
+        context: back
+        dockerfile: Dockerfile.production
+        push: false
+        tags: numerisisep/back:prod
+        cache-from: type=gha
+        cache-to: type=gha
+
+  front-prod:
+    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 front prod
+      uses: docker/build-push-action@v3
+      with:
+        context: front
+        dockerfile: Dockerfile.production
+        push: false
+        tags: numerisisep/front:prod
+        cache-from: type=gha
+        cache-to: type=gha
+
+  back-dev:
+    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 back dev
+      uses: docker/build-push-action@v3
+      with:
+        context: back
+        dockerfile: Dockerfile
+        push: false
+        tags: numerisisep/back:dev
+        cache-from: type=gha
+        cache-to: type=gha
+
+  front-dev:
+    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 front dev
+      uses: docker/build-push-action@v3
+      with:
+        context: front
+        dockerfile: Dockerfile
+        push: false
+        tags: numerisisep/front:dev
+        cache-from: type=gha
+        cache-to: type=gha

docker-compose.infra.yml

@@ -1,6 +1,23 @@
 version: "3.9"
 services:
 
+  caddy:
+    image: lucaslorentz/caddy-docker-proxy:ci-alpine
+    restart: unless-stopped
+    environment:
+      CADDY_INGRESS_NETWORKS: caddy
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      # docker rootless daemon socket https://docs.docker.com/engine/security/rootless/
+      - /var/run/docker.sock:/var/run/docker.sock
+      - caddy_data:/data
+    networks:
+      - caddy
+    healthcheck:
+      test: ["CMD", "curl", "-f", "localhost:80"]
+
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:latest
     container_name: numeris_phpmyadmin
@@ -24,18 +41,18 @@ services:
     restart: unless-stopped
     networks:
       - mysql
+    ports:
+      - 127.0.0.1:3306:3306
     env_file:
       - .env
     volumes:
     - ./var/mysql:/var/lib/mysql
+    # - /var/run/mysqld:/var/run/mysqld
 
   back:
-    image: numerisisep/numeris-back
+    image: numerisisep/numeris-back:prod
     container_name: numeris_back
     restart: unless-stopped
-    build:
-      context: ./back
-      dockerfile: Dockerfile.production
     networks:
       - caddy
       - mysql
@@ -48,14 +65,10 @@ services:
     labels:
       caddy: api.numeris-isep.fr
       caddy.reverse_proxy: "{{upstreams 80}}"
-        # caddy.reverse_proxy.header_down: -Access-Control-Allow-Origin
 
   front:
-    image: numerisisep/numeris-front
+    image: numerisisep/numeris-front:prod
     container_name: numeris_front
-    build:
-      context: ./front
-      dockerfile: Dockerfile.production
     networks:
       - caddy
     labels:
@@ -63,22 +76,31 @@ services:
       caddy.reverse_proxy: "{{upstreams 80}}"
 
 
-  caddy:
-    image: lucaslorentz/caddy-docker-proxy:ci-alpine
+  back-staging:
+    image: numerisisep/numeris-back:staging
+    container_name: numeris_back
     restart: unless-stopped
-    environment:
-      CADDY_INGRESS_NETWORKS: caddy
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      # docker rootless daemon socket https://docs.docker.com/engine/security/rootless/
-      - /var/run/docker.sock:/var/run/docker.sock
-      - caddy_data:/data
     networks:
       - caddy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "localhost:80"]
+      - mysql
+    env_file:
+      - .env
+    volumes:
+      - .env:/home/numeris/.env
+    depends_on:
+      - mysql
+    labels:
+      caddy: api.staging.numeris-isep.fr
+      caddy.reverse_proxy: "{{upstreams 80}}"
+
+  front-staging:
+    image: numerisisep/numeris-front:staging
+    container_name: numeris_front
+    networks:
+      - caddy
+    labels:
+      caddy: staging.numeris-isep.fr
+      caddy.reverse_proxy: "{{upstreams 80}}"
 
 networks:
   caddy:

docker-compose.staging.yml

@@ -1,90 +0,0 @@
-version: "3.9"
-services:
-
-  phpmyadmin:
-    image: phpmyadmin/phpmyadmin:latest
-    container_name: numeris_phpmyadmin
-    restart: unless-stopped
-    ports:
-      - 3000:80
-    links:
-      - mysql:db
-    depends_on:
-      - mysql
-    networks:
-      - caddy
-      - mysql
-    labels:
-      caddy: phpmyadmin.staging.numeris-isep.fr
-      caddy.reverse_proxy: "{{upstreams 80}}"
-
-  # mysql:
-  #   image: mysql:5.7
-  #   container_name: numeris_mysql
-  #   restart: unless-stopped
-  #   networks:
-  #     - mysql
-  #   env_file:
-  #     - .env
-  #   volumes:
-  #   - ./var/mysql:/var/lib/mysql
-
-  back:
-    image: numerisisep/numeris-back
-    container_name: numeris_back
-    restart: unless-stopped
-    build:
-      context: ./back
-      dockerfile: Dockerfile.production
-    networks:
-      - caddy
-      - mysql
-    env_file:
-      - .env
-    volumes:
-      - .env:/home/numeris/.env
-    depends_on:
-      - mysql
-    labels:
-      caddy: api.staging.numeris-isep.fr
-      caddy.reverse_proxy: "{{upstreams 80}}"
-        # caddy.reverse_proxy.header_down: -Access-Control-Allow-Origin
-
-  front:
-    image: numerisisep/numeris-front
-    container_name: numeris_front
-    build:
-      context: ./front
-      dockerfile: Dockerfile.production
-    networks:
-      - caddy
-    labels:
-      caddy: staging.numeris-isep.fr
-      caddy.reverse_proxy: "{{upstreams 80}}"
-
-
-  # caddy:
-  #   image: lucaslorentz/caddy-docker-proxy:ci-alpine
-  #   restart: unless-stopped
-  #   environment:
-  #     CADDY_INGRESS_NETWORKS: caddy
-  #   ports:
-  #     - "80:80"
-  #     - "443:443"
-  #   volumes:
-  #     # docker rootless daemon socket https://docs.docker.com/engine/security/rootless/
-  #     - /var/run/docker.sock:/var/run/docker.sock
-  #     - caddy_data:/data
-  #   networks:
-  #     - caddy
-  #   healthcheck:
-  #     test: ["CMD", "curl", "-f", "localhost:80"]
-
-networks:
-  caddy:
-    external: true
-  mysql:
-
-volumes:
-  caddy_data:
-  mysql:

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.9"
+version: '3'
 services:
 
   phpmyadmin:
@@ -9,46 +9,46 @@ services:
       - mysql:db
     depends_on:
       - mysql
+    container_name: numeris_phpmyadmin
 
   mysql:
     image: mysql:5.7
     environment:
       MYSQL_DATABASE: 'numeris'
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+    container_name: numeris_mysql
 
   back:
-    image: numerisisep/back:dev
-    container_name: numeris-back
     build:
       context: ./back
       dockerfile: Dockerfile
-    env_file:
-      - ./back/.env
     environment:
-      DB_HOST: ${DB_HOST:-mysql}
-      DB_PORT: ${DB_PORT:-3306}
-      DB_DATABASE: ${DB_DATABASE:-numeris}
-      DB_USERNAME: ${DB_USERNAME:-root}
-      DB_PASSWORD: ${DB_PASSWORD}
+      DB_HOST: mysql
+      DB_PORT: 3306
+      DB_DATABASE: numeris
+      DB_USERNAME: root
+      DB_PASSWORD:
     volumes:
       - ./back:/home/numeris
       - /home/numeris/vendor
     ports:
-      - ${BACK_PORT:-8080}:80
+      - ${BACK_PORT:-8000}:80
     links:
       - mysql
     depends_on:
       - mysql
+    container_name: numeris_back
 
   front:
-    image: numerisisep/front:dev
-    container_name: numeris-front
     build:
       context: ./front
       dockerfile: Dockerfile
     volumes:
       - ./front/src:/home/numeris/src
       - /home/numeris/node_modules
+    links:
+      - back
     ports:
-      - ${FRONT_PORT:-4200}:80
-    # command: ng serve --host 0.0.0.0
+      - ${FRONT_PORT:-8080}:80
+    command: ng s --host 0.0.0.0
+    container_name: numeris_front

front/Dockerfile

@@ -1,16 +1,9 @@
 FROM node:11.15.0 as builder
-
-LABEL source="https://github.com/numerisisep/numeris-v2"
-LABEL maintainer="support@numeris-isep.fr"
-
 WORKDIR /opt/numeris
 ENV PATH /opt/numeris/node_modules/.bin:$PATH
-
-COPY package.json yarn.lock ./
+COPY package.json yarn.lock /opt/numeris/
 RUN yarn install
 # RUN yarn add -g @angular/cli@7.3.9
 COPY . .
 RUN yarn run build-prod
-
-EXPOSE 80
-ENTRYPOINT [ "ng", "serve", "--host", "0.0.0.0", "--port", "80" ]
+ENTRYPOINT [ "ng", "serve", "--port", "80" ]

front/Dockerfile.production

@@ -1,7 +1,8 @@
 FROM node:11.15.0 as builder
 WORKDIR /opt/numeris
 ENV PATH /opt/numeris/node_modules/.bin:$PATH
-COPY package.json yarn.lock ./
+COPY package.json /opt/numeris/
+COPY yarn.lock /opt/numeris/
 RUN yarn install
 # RUN yarn add -g @angular/cli@7.3.9
 COPY . .

makefile

@@ -37,83 +37,83 @@ reload: stop start
 #############################
 
 back-install:
-	docker exec -it numeris-back composer install
+	docker exec -it numeris_back composer install
 
 back-update:
-	docker exec -it numeris-back composer update
+	docker exec -it numeris_back composer update
 
 front-install:
-	docker exec -it numeris-front npm install
+	docker exec -it numeris_front npm install
 
 front-update:
-	docker exec -it numeris-front npm update
+	docker exec -it numeris_front npm update
 
 front-fix-vulnerabilities:
-	docker exec -it numeris-front npm audit fix
+	docker exec -it numeris_front npm audit fix
 
 
 ## Shell commands
 ###################
 
 shell-back:
-	docker exec -it numeris-back bash
+	docker exec -it numeris_back bash
 
 shell-front:
-	docker exec -it numeris-front bash
+	docker exec -it numeris_front bash
 
 shell-sql:
-	docker exec -it numeris-mysql bash
+	docker exec -it numeris_mysql bash
 
 tinker:
-	docker exec -it numeris-back sh -c 'php artisan tinker'
+	docker exec -it numeris_back sh -c 'php artisan tinker'
 
 
 ## Database commands
 ######################
 
 db-reset:
-	docker exec -it numeris-back sh -c 'php artisan migrate:refresh --seed'
+	docker exec -it numeris_back sh -c 'php artisan migrate:refresh --seed'
 
 migrate:
-	docker exec -it numeris-back sh -c 'php artisan migrate'
+	docker exec -it numeris_back sh -c 'php artisan migrate'
 
 migrate-prod:
-	docker exec -t numeris-back sh -c 'php artisan migrate --force'
+	docker exec -t numeris_back sh -c 'php artisan migrate --force'
 
 db-refresh:
-	docker exec -it numeris-back sh -c 'php artisan migrate:refresh'
+	docker exec -it numeris_back sh -c 'php artisan migrate:refresh'
 
 migrate-rollback:
-	docker exec -it numeris-back sh -c 'php artisan migrate:rollback'
+	docker exec -it numeris_back sh -c 'php artisan migrate:rollback'
 
 db-seed:
-	docker exec -it numeris-back sh -c 'php artisan db:seed'
+	docker exec -it numeris_back sh -c 'php artisan db:seed'
 
 
 ## Test commands
 ###################
 
 test:
-	docker exec -it numeris-back sh -c 'vendor/bin/phpunit'
+	docker exec -it numeris_back sh -c 'vendor/bin/phpunit'
 
 
 ## Utils commands
 ###################
 
 log-back:
-	docker exec -it numeris-back sh -c 'less +G storage/logs/laravel.log'
+	docker exec -it numeris_back sh -c 'less +G storage/logs/laravel.log'
 
 config-clear:
-	docker exec numeris-back sh -c 'php artisan config:clear'
-	docker exec numeris-back sh -c 'php artisan cache:clear'
-	docker exec numeris-back sh -c 'php artisan route:clear'
+	docker exec numeris_back sh -c 'php artisan config:clear'
+	docker exec numeris_back sh -c 'php artisan cache:clear'
+	docker exec numeris_back sh -c 'php artisan route:clear'
 
 config-cache:
-	docker exec numeris-back sh -c 'php artisan route:cache'
-	docker exec numeris-back sh -c 'php artisan config:cache'
+	docker exec numeris_back sh -c 'php artisan route:cache'
+	docker exec numeris_back sh -c 'php artisan config:cache'
 
 key-generate:
-	docker exec numeris-back sh -c 'php artisan key:generate'
+	docker exec numeris_back sh -c 'php artisan key:generate'
 
 jwt-secret:
-	docker exec numeris-back sh -c 'php artisan jwt:secret'
+	docker exec numeris_back sh -c 'php artisan jwt:secret'