Merge branch 'php7.4' into marc

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

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

.github/workflows/docker.yml

@@ -0,0 +1,38 @@
+name: Docker
+
+on:
+  push:
+    branches:
+      - "master"
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+  # Run tests for any PRs.
+  pull_request:
+
+jobs:
+  build:
+    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 Docker images
+      uses: docker/build-push-action@v3
+      with:
+        context: back
+        dockerfile: Dockerfile.production
+        push: true
+        tags: marcpartensky/numeris-back:latest

back/Dockerfile

@@ -1,6 +1,4 @@
-FROM php:7.2-apache
-
-RUN mkdir -p /home/numeris
+FROM php:7.4-apache
 
 # Install packages
 RUN apt-get update && apt-get install -y \
@@ -8,7 +6,9 @@ RUN apt-get update && apt-get install -y \
     zip \
     unzip \
     nano \
-    libpng-dev
+    libpng-dev \
+    libzip-dev
+
 
 # Install the PHP mcrypt pdo_mysql extension
 RUN docker-php-ext-install pdo_mysql gd zip
@@ -21,18 +21,15 @@ RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && se
 # Enable php conf
 COPY docker/php/php.ini /usr/local/etc/php/conf.d/default.ini
 
-COPY . /home/numeris
+WORKDIR /opt/numeris
+COPY . .
 
 # Composer install
-WORKDIR /home/numeris
 RUN composer install --no-interaction
 
 # Final touch
-RUN . ~/.bashrc
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN usermod -u 1000 www-data
-RUN chown -R www-data:www-data /home/numeris
+RUN chown -R www-data:www-data /opt/numeris
 RUN chown -R www-data:www-data /var/log/apache2/
-
-WORKDIR /home/numeris

back/Dockerfile.production

@@ -1,6 +1,4 @@
-FROM php:7.2-apache
-
-RUN mkdir -p /home/numeris
+FROM php:7.4-apache
 
 # Install packages
 RUN apt-get update && apt-get install -y \
@@ -8,7 +6,8 @@ RUN apt-get update && apt-get install -y \
     zip \
     unzip \
     nano \
-    libpng-dev
+    libpng-dev \
+    libzip-dev
 
 # Install the PHP mcrypt pdo_mysql extension
 RUN docker-php-ext-install pdo_mysql gd zip
@@ -20,21 +19,18 @@ RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && se
 # Enable php conf
 COPY docker/php/php.ini /usr/local/etc/php/conf.d/default.ini
 
-COPY . /home/numeris
+WORKDIR /opt/numeris
+COPY . .
 
 ### Back config ###
-WORKDIR /home/numeris
 RUN composer install --optimize-autoloader --no-dev --no-interaction
 
 # Final touch
-RUN . ~/.bashrc
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN usermod -u 1000 www-data
-RUN chown -R www-data:www-data /home/numeris
+RUN chown -R www-data:www-data /opt/numeris
 RUN chown -R www-data:www-data /var/log/apache2/
 
-WORKDIR /home/numeris
-
 RUN php artisan config:cache
 RUN php artisan route:cache

docker-compose.production.yml

@@ -3,76 +3,32 @@ 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}}"
 
   mysql:
     image: mysql:5.7
-    container_name: numeris_mysql
     restart: unless-stopped
     env_file:
       - .env
     volumes:
-    - ./var/mysql:/var/lib/mysql
+    - mysql:/var/lib/mysql
 
   back:
-    container_name: numeris_back
-    restart: unless-stopped
     build:
       context: ./back
       dockerfile: Dockerfile
     env_file:
       - .env
+    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:

docker-compose.testing.yml

@@ -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