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

.dockerignore

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

.github/workflows/docker.yml

@@ -14,8 +14,7 @@ on:
   pull_request:
 
 jobs:
-  build-front:
-    name: Build front
+  build:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -32,58 +31,10 @@ jobs:
         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:latest
-
-  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
+    - name: Build and push Docker images
       uses: docker/build-push-action@v3
       with:
         context: back
         dockerfile: Dockerfile.production
         push: true
-        tags: numerisisep/numeris-back:latest
-
-
-  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.production.yml pull
-          docker-compose -f docker-compose.production.yml up -d --force-recreate
+        tags: marcpartensky/numeris-back:latest

back/.dockerignore

@@ -2,5 +2,3 @@
 vendor
 public/storage
 public/build
-.env
-.env.template

back/Dockerfile

@@ -21,7 +21,7 @@ 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
 
-WORKDIR /home/numeris
+WORKDIR /opt/numeris
 COPY . .
 
 # Composer install
@@ -31,7 +31,5 @@ RUN composer install --no-interaction
 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/
-
-ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]

back/Dockerfile.production

@@ -15,15 +15,11 @@ RUN docker-php-ext-install pdo_mysql gd zip
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 # Enable apache conf
 COPY docker/apache/numeris.conf /etc/apache2/sites-available/numeris.conf
-RUN a2dissite 000-default.conf && \
-      a2ensite numeris.conf && \
-      a2enmod headers && \
-      a2enmod rewrite && \
-      service apache2 restart
+RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && service apache2 restart
 # Enable php conf
 COPY docker/php/php.ini /usr/local/etc/php/conf.d/default.ini
 
-WORKDIR /home/numeris
+WORKDIR /opt/numeris
 COPY . .
 
 ### Back config ###
@@ -33,10 +29,8 @@ RUN composer install --optimize-autoloader --no-dev --no-interaction
 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/
 
 RUN php artisan config:cache
 RUN php artisan route:cache
-
-ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]

back/composer.json

@@ -1,11 +1,7 @@
 {
     "name": "2seg/numeris-v2",
     "description": "Home of the new website of Numéris.",
-    "keywords": [
-        "Numéris",
-        "association",
-        "website"
-    ],
+    "keywords": ["Numéris", "association", "website"],
     "license": "MIT",
     "type": "project",
     "authors": [
@@ -18,11 +14,6 @@
             "name": "MinhNam Nguyen",
             "email": "nguyen.minhnam@hotmail.fr",
             "role": "Developer"
-        },
-        {
-            "name": "Marc Partensky",
-            "email": "marc@marcpartensky.com",
-            "role": "Developer"
         }
     ],
     "require": {
@@ -60,7 +51,8 @@
     },
     "extra": {
         "laravel": {
-            "dont-discover": []
+            "dont-discover": [
+            ]
         }
     },
     "scripts": {

back/docker/apache/numeris.conf

@@ -6,14 +6,10 @@
     # Force HTTPS when X-Forwarded-Proto is passed as HTTPS
     # Useful when the reverse proxy is in HTTPS
     SetEnvIf x-forwarded-proto https HTTPS=on
-    # Header set Access-Control-Allow-Origin "*"
-    # Header set Access-Control-Allow-Origin "numeris-isep.fr"
-    Header set Access-Control-Allow-Origin "https://numeris-isep.fr"
     AllowOverride All
     Require all granted
   </Directory>
 
-  LogLevel info
-  ErrorLog /var/log/apache2/error.log
-  CustomLog /var/log/apache2/access.log combined
+  ErrorLog /var/log/apache2/numeris-error.log
+  CustomLog /var/log/apache2/numeris-access.log combined
 </VirtualHost>

back/entrypoint.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-
-php artisan key:generate
-# php artisan key:generate --force
-php artisan jwt:secret
-# php artisan jwt:secret --force
-# php artisan cache:clear
-php artisan config:clear
-php artisan migrate:refresh
-
-docker-php-entrypoint
-apache2-foreground

docker-compose.production.yml

@@ -3,7 +3,6 @@ services:
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:latest
-    container_name: numeris_phpmyadmin
     restart: unless-stopped
     ports:
       - 3000:80
@@ -11,80 +10,32 @@ services:
       - mysql:db
     depends_on:
       - mysql
-    networks:
-      - caddy
-      - mysql
-    labels:
-      caddy: phpmyadmin.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
+    - 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
+      dockerfile: Dockerfile
     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
-    networks:
-      - caddy
-    labels:
-      caddy: 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:
+      dockerfile: Dockerfile
+    depends_on:
+      - back
+    entrypoint: ng s --host 0.0.0.0
 
 volumes:
-  caddy_data:
   mysql:

docker-compose.testing.yml

@@ -1,31 +1,25 @@
-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
-    volumes:
-      - ./var/mysql_testing:/var/lib/mysql
 
   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
     container_name: numeris_back
-    restart: unless-stopped
     build:
       context: ./back
       dockerfile: Dockerfile
@@ -44,14 +38,12 @@ services:
       - mysql
 
   front:
-    image: numerisisep/numeris-front
     container_name: numeris_front
-    restart: unless-stopped
     build:
       context: ./front
       dockerfile: Dockerfile
     ports:
-      - 8000:80
+      - 4200:4200
     links:
       - back
     depends_on:

front/.dockerignore

@@ -1,4 +1,3 @@
 .DS_Store
 node_modules/
 dist/
-Dockerfile

front/Dockerfile

@@ -1,10 +1,18 @@
-FROM node:11.15.0 as builder
-WORKDIR /opt/numeris
-ENV PATH /opt/numeris/node_modules/.bin:$PATH
-COPY package*.json /opt/numeris/
-RUN npm ci
+FROM node:11.15.0
+
+RUN mkdir -p /home/numeris
+
+ENV PATH /home/numeris/node_modules/.bin:$PATH
+
+COPY package*.json /home/numeris/
+
+# npm install
+WORKDIR /home/numeris
+RUN npm install
 RUN npm install -g @angular/cli@7.3.9
-COPY . .
+
+COPY . /home/numeris
+
 RUN npm rebuild node-sass
-RUN npm run build
-ENTRYPOINT [ "ng", "serve", "--configuration", "production", "--port", "80"]
+
+WORKDIR /home/numeris

front/Dockerfile.production

@@ -1,17 +0,0 @@
-FROM node:11.15.0 as builder
-WORKDIR /opt/numeris
-ENV PATH /opt/numeris/node_modules/.bin:$PATH
-COPY package.json /opt/numeris/
-COPY yarn.lock /opt/numeris/
-RUN yarn install
-# RUN yarn add -g @angular/cli@7.3.9
-COPY . .
-RUN yarn run build-prod
-ENTRYPOINT [ "ng", "serve", "--configuration", "production", "--port", "80" ]
-
-FROM nginx
-COPY nginx.conf /etc/nginx/conf.d/default.conf
-RUN rm -rf /usr/share/nginx/html/*
-COPY --from=builder /opt/numeris/dist /usr/share/nginx/html
-EXPOSE 80
-ENTRYPOINT ["nginx", "-g", "daemon off;"]

front/nginx.conf

@@ -1,14 +0,0 @@
-server {
-    gzip on;
-    gzip_types      text/plain text/css application/javascript;
-    gzip_proxied    no-cache no-store private expired auth;
-    gzip_min_length 1000;
-
-    listen 80;
-    server_name 0.0.0.0;
-    root /usr/share/nginx/html;
-    index index.html;
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-}

front/package.json

@@ -60,6 +60,6 @@
     "protractor": "~5.4.2",
     "ts-node": "~8.0.3",
     "tslint": "~5.14.0",
-    "typescript": "3.1.1"
+    "typescript": "^3.2.4"
   }
 }