open to everyone

This reverts commit b466e5b6ee.

.dockerignore

@@ -4,7 +4,8 @@
 .vscode
 .DS_Store
 docker-compose*.yml
-.env*
+.env
+.env.template
 
 # Back
 back/.DS_Store

.github/workflows/docker.yml

@@ -14,7 +14,8 @@ on:
   pull_request:
 
 jobs:
-  build:
+  build-front:
+    name: Build front
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -31,10 +32,58 @@ jobs:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-    - name: Build and push Docker images
+    - 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
       uses: docker/build-push-action@v3
       with:
         context: back
         dockerfile: Dockerfile.production
         push: true
-        tags: marcpartensky/numeris-back:latest
+        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

back/.dockerignore

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

back/Dockerfile.production

@@ -15,7 +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 rewrite && service apache2 restart
+RUN a2dissite 000-default.conf && \
+      a2ensite numeris.conf && \
+      a2enmod headers && \
+      a2enmod rewrite && \
+      service apache2 restart
 # Enable php conf
 COPY docker/php/php.ini /usr/local/etc/php/conf.d/default.ini
 

back/docker/apache/numeris.conf

@@ -6,6 +6,9 @@
     # 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>

back/entrypoint.sh

@@ -1,8 +1,12 @@
 #!/usr/bin/env sh
 
-php artisan key:generate --force
-php artisan jwt:secret --force
-php artisan migrate:refresh --seed --force
+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

@@ -30,6 +30,7 @@ services:
     - ./var/mysql:/var/lib/mysql
 
   back:
+    image: numerisisep/numeris-back
     container_name: numeris_back
     restart: unless-stopped
     build:
@@ -40,24 +41,23 @@ services:
       - mysql
     env_file:
       - .env
+    volumes:
+      - .env:/home/numeris/.env
     depends_on:
       - mysql
-    networks:
-      - caddy
     labels:
       caddy: api.numeris-isep.fr
       caddy.reverse_proxy: "{{upstreams 80}}"
-      caddy.reverse_proxy.header_down: -Access-Control-Allow-Origin
+        # caddy.reverse_proxy.header_down: -Access-Control-Allow-Origin
 
   front:
+    image: numerisisep/numeris-front
     container_name: numeris_front
     build:
       context: ./front
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.production
     networks:
       - caddy
-    depends_on:
-      - back
     labels:
       caddy: numeris-isep.fr
       caddy.reverse_proxy: "{{upstreams 80}}"

docker-compose.testing.yml

@@ -23,7 +23,7 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
 
   back:
-    image: numeris-back
+    image: numerisisep/numeris-back
     container_name: numeris_back
     restart: unless-stopped
     build:
@@ -44,7 +44,7 @@ services:
       - mysql
 
   front:
-    image: numeris-front
+    image: numerisisep/numeris-front
     container_name: numeris_front
     restart: unless-stopped
     build:
@@ -54,5 +54,3 @@ services:
       - 8000:80
     links:
       - back
-    depends_on:
-      - back

front/.dockerignore

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

front/Dockerfile

@@ -1,17 +1,10 @@
 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
-RUN npm install -g @angular/cli@7.3.9
+COPY package.json /opt/numeris/
+COPY yarn.lock /opt/numeris/
+RUN yarn install
+# RUN yarn add -g @angular/cli@7.3.9
 COPY . .
-RUN npm rebuild node-sass
-RUN npm run build-prod
-ENTRYPOINT [ "ng", "s", "--host", "0.0.0.0" ]
-
-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;"]
+RUN yarn run build-prod
+ENTRYPOINT [ "ng", "serve", "--configuration", "production", "--port", "80", "--host", "0.0.0.0" ]

front/Dockerfile.production

@@ -0,0 +1,17 @@
+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,19 +1,14 @@
 server {
-  listen 80;
-  sendfile on;
-  default_type application/octet-stream;
-  gzip on;
-  gzip_http_version 1.1;
-  gzip_disable      "MSIE [1-6]\.";
-  gzip_min_length   1100;
-  gzip_vary         on;
-  gzip_proxied      expired no-cache no-store private auth;
-  gzip_types        text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
-  gzip_comp_level   9;
+    gzip on;
+    gzip_types      text/plain text/css application/javascript;
+    gzip_proxied    no-cache no-store private expired auth;
+    gzip_min_length 1000;
 
-  root /usr/share/nginx/html;
-
-  location / {
-    try_files $uri $uri/ /index.html =404;
-  }
+    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.2.4"
+    "typescript": "3.1.1"
   }
 }