new ports

Merge remote-tracking branch 'origin/docker-compose' into front-multistage
ci
2022-09-21 16:25:45 +02:00 · 2022-09-21 16:20:32 +02:00 · 2022-09-21 11:03:09 +02:00 · 2022-09-21 10:40:50 +02:00 · 2022-09-21 10:37:25 +02:00 · 2022-09-21 10:36:47 +02:00
28 changed files with 13905 additions and 11954 deletions
@@ -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/
@@ -1,91 +0,0 @@
-name: Deploy production
-
-on:
-  push:
-    branches:
-      - "master"
-    # Publish `v1.2.3` tags as releases.
-    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
-        file: front/Dockerfile.production
-        push: true
-        tags: numerisisep/numeris-front:prod
-        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
-        file: back/Dockerfile.production
-        push: true
-        tags: numerisisep/numeris-back:prod
-        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 rm -f front back
-          docker-compose -f docker-compose.infra.yml up -d front back
-          docker system prune -a
-          # storage is limited so we clean
@@ -1,91 +0,0 @@
-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:
-        build-args: ENVIRONMENT=staging
-        context: front
-        file: front/Dockerfile.production
-        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:
-        build-args: ENVIRONMENT=staging
-        context: back
-        file: back/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 rm -f front-staging back-staging
-          docker-compose -f docker-compose.infra.yml up -d front-staging back-staging
-          docker system prune -a
-          # storage is limited so we clean
@@ -1,111 +0,0 @@
-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
@@ -1,5 +1,4 @@
 .idea/
 .vscode/
 .env
-.env*
-var/
+var/
@@ -1,10 +1,6 @@
-[![Deploy production](https://github.com/numeris-isep/numeris-v2/actions/workflows/prod.yml/badge.svg?branch=master)](https://github.com/numeris-isep/numeris-v2/actions/workflows/prod.yml)
-[![Deploy staging](https://github.com/numeris-isep/numeris-v2/actions/workflows/staging.yml/badge.svg?branch=staging)](https://github.com/numeris-isep/numeris-v2/actions/workflows/staging.yml)
-[![Test docker build](https://github.com/numeris-isep/numeris-v2/actions/workflows/test.yml/badge.svg)](https://github.com/numeris-isep/numeris-v2/actions/workflows/test.yml)
-
 # Numeris-v2

-<!-- [![Build Status](https://travis-ci.com/2Seg/numeris-v2.svg?branch=master)](https://travis-ci.com/2Seg/numeris-v2) -->
+[![Build Status](https://travis-ci.com/2Seg/numeris-v2.svg?branch=master)](https://travis-ci.com/2Seg/numeris-v2)

 > Created and maintened by [2Seg](https://github.com/2Seg)

@@ -2,5 +2,3 @@
 vendor
 public/storage
 public/build
-.env
-.env.template
@@ -1,4 +1,6 @@
-FROM php:7.4-apache
+FROM php:7.2-apache
+
+RUN mkdir -p /home/numeris

 # Install packages
 RUN apt-get update && apt-get install -y \
@@ -6,9 +8,7 @@ RUN apt-get update && apt-get install -y \
    zip \
    unzip \
    nano \
-    libpng-dev \
-    libzip-dev
-
+    libpng-dev

 # Install the PHP mcrypt pdo_mysql extension
 RUN docker-php-ext-install pdo_mysql gd zip
@@ -17,25 +17,22 @@ 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
-COPY . .
+COPY . /home/numeris

 # 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 /var/log/apache2/

-ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]
+WORKDIR /home/numeris
@@ -1,4 +1,6 @@
-FROM php:7.4-apache
+FROM php:7.2-apache
+
+RUN mkdir -p /home/numeris

 # Install packages
 RUN apt-get update && apt-get install -y \
@@ -6,8 +8,7 @@ RUN apt-get update && apt-get install -y \
    zip \
    unzip \
    nano \
-    libpng-dev \
-    libzip-dev
+    libpng-dev

 # Install the PHP mcrypt pdo_mysql extension
 RUN docker-php-ext-install pdo_mysql gd zip
@@ -15,28 +16,25 @@ 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
-COPY . .
+COPY . /home/numeris

 ### 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 /var/log/apache2/

+WORKDIR /home/numeris
+
 RUN php artisan config:cache
 RUN php artisan route:cache
-
-ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]
@@ -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": {
@@ -6,22 +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 add Access-Control-Allow-Origin "https://numeris-isep.fr"
-    # Header add Access-Control-Allow-Origin "https://staging.numeris-isep.fr"
-    # Header always append Access-Control-Allow-Origin: "https://numeris-isep.fr"
-    # Header always append Access-Control-Allow-Origin: "https://staging.numeris-isep.fr"
-    # Header always append Access-Control-Allow-Origin: "https://api.numeris-isep.fr"
-    # Header always append Access-Control-Allow-Origin: "https://api.staging.numeris-isep.fr"
-    SetEnvIf Origin "http(s)?://(www\.)?(staging\.)?numeris-isep.fr$" AccessControlAllowOrigin=$0
-    Header add Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
-    Header set Access-Control-Allow-Credentials true
    AllowOverride All
    Require all granted
-    LogLevel debug
  </Directory>

-  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>
@@ -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
@@ -1,116 +0,0 @@
-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
-    restart: unless-stopped
-    ports:
-      - 3000:80
-    links:
-      - 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
-    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:prod
-    container_name: numeris_back
-    restart: unless-stopped
-    networks:
-      - caddy
-      - mysql
-    env_file:
-      - .env
-    volumes:
-      - .env:/home/numeris/.env
-    depends_on:
-      - mysql
-    labels:
-      caddy: api.numeris-isep.fr
-      caddy.reverse_proxy: "{{upstreams 80}}"
-
-  front:
-    image: numerisisep/numeris-front:prod
-    container_name: numeris_front
-    restart: unless-stopped
-    networks:
-      - caddy
-    labels:
-      caddy: numeris-isep.fr
-      caddy.reverse_proxy: "{{upstreams 80}}"
-
-
-  back-staging:
-    image: numerisisep/numeris-back:staging
-    container_name: numeris_back_staging
-    restart: unless-stopped
-    networks:
-      - caddy
-      - mysql
-    env_file:
-      - .env.staging
-    volumes:
-      - .env.staging:/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_staging
-    restart: unless-stopped
-    networks:
-      - caddy
-    labels:
-      caddy: staging.numeris-isep.fr
-      caddy.reverse_proxy: "{{upstreams 80}}"
-
-networks:
-  caddy:
-    name: caddy
-    # external: true
-    attachable: true
-  mysql:
-
-volumes:
-  caddy_data:
-  mysql:
@@ -0,0 +1,44 @@
+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
+
+  mysql:
+    image: mysql:5.7
+    container_name: numeris_mysql
+    restart: unless-stopped
+    env_file:
+      - .env
+    volumes:
+    - ./var/mysql:/var/lib/mysql
+
+  back:
+    container_name: numeris_back
+    restart: unless-stopped
+    build:
+      context: ./back
+      dockerfile: Dockerfile
+    env_file:
+      - .env
+    depends_on:
+    - mysql
+
+  front:
+    container_name: numeris_front
+    build:
+      context: ./front
+      dockerfile: Dockerfile
+    depends_on:
+      - back
+
+volumes:
+  mysql:
@@ -0,0 +1,52 @@
+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'
+
+  back:
+    container_name: numeris_back
+    build:
+      context: ./back
+      dockerfile: Dockerfile
+    environment:
+      DB_CONNECTION: testing
+      DB_HOST_TESTING: mysql
+      DB_PORT_TESTING: 3306
+      DB_DATABASE_TESTING: numeris_testing
+      DB_USERNAME_TESTING: root
+      DB_PASSWORD_TESTING:
+    ports:
+      - 8080:80
+    links:
+      - mysql
+    depends_on:
+      - mysql
+
+  front:
+    container_name: numeris_front
+    build:
+      context: ./front
+      dockerfile: Dockerfile
+    ports:
+      - 8000:80
+    links:
+      - back
+    depends_on:
+      - back
@@ -3,46 +3,45 @@ services:

  phpmyadmin:
    image: phpmyadmin/phpmyadmin:latest
-    container_name: numeris_phpmyadmin
    ports:
      - 3000:80
    links:
      - mysql:db
    depends_on:
      - mysql
+    container_name: numeris_phpmyadmin

  mysql:
    image: mysql:5.7
-    container_name: numeris_mysql
    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: mysql
-      DB_PORT: 3306
-      DB_DATABASE: numeris
-      DB_USERNAME: root
-      DB_PASSWORD: ""
+      DB_HOST: ${DB_HOST}
+      DB_PORT: ${DB_PORT}
+      DB_DATABASE: ${DB_DATABASE}
+      DB_USERNAME: ${DB_USERNAME}
+      DB_PASSWORD: ${DB_PASSWORD}
    volumes:
      - ./back:/home/numeris
      - /home/numeris/vendor
    ports:
-      - ${BACK_PORT:-8000}:8000
+      - ${BACK_PORT}:80
    links:
      - mysql
    depends_on:
      - mysql
+    container_name: numeris_back

  front:
-    image: numerisisep/front:dev
-    container_name: numeris_front
    build:
      context: ./front
      dockerfile: Dockerfile
@@ -51,5 +50,9 @@ services:
      - /home/numeris/node_modules
    links:
      - back
+    expose:
+      - ${FRONT_PORT}
    ports:
-      - ${FRONT_PORT:-8080}:80
+      - ${FRONT_PORT}:${FRONT_PORT}
+    command: ng s --host 0.0.0.0
+    container_name: numeris_front
@@ -1,4 +1,3 @@
 .DS_Store
 node_modules/
 dist/
-Dockerfile
@@ -1,9 +1,17 @@
 FROM node:11.15.0 as builder
 WORKDIR /opt/numeris
 ENV PATH /opt/numeris/node_modules/.bin:$PATH
-COPY package.json yarn.lock /opt/numeris/
-RUN yarn install
-# RUN yarn add -g @angular/cli@7.3.9
+COPY package*.json /opt/numeris/
+RUN npm ci
+RUN npm install -g @angular/cli@7.3.9
 COPY . .
-RUN yarn run build
-ENTRYPOINT [ "ng", "serve", "--port", "80" ]
+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;"]
@@ -1,18 +0,0 @@
-FROM node:11.15.0 as builder
-ARG ENVIRONMENT=production
-WORKDIR /opt/numeris
-ENV PATH /opt/numeris/node_modules/.bin:$PATH
-COPY package.json /opt/numeris/
-COPY yarn.lock /opt/numeris/
-RUN yarn install
-COPY . .
-RUN yarn run build-$ENVIRONMENT
-ENTRYPOINT [ "ng", "serve", "--configuration", "$ENVIRONMENT", "--port", "80" ]
-
-FROM nginx
-COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
-COPY nginx/mime.types /etc/nginx/mime.types
-RUN rm -rf /usr/share/nginx/html/*
-COPY --from=builder /opt/numeris/dist /usr/share/nginx/html
-EXPOSE 80
-ENTRYPOINT ["nginx", "-g", "daemon off;"]
@@ -47,25 +47,6 @@
              "buildOptimizer": true,
              "serviceWorker": true,
              "ngswConfigPath": "src/ngsw-config.json"
-            },
-            "staging": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.staging.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "extractCss": true,
-              "namedChunks": false,
-              "aot": true,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
-              "serviceWorker": true,
-              "ngswConfigPath": "src/ngsw-config.json"
            }
          }
        },
@@ -0,0 +1,19 @@
+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;
+
+  root /usr/share/nginx/html;
+
+  location / {
+    try_files $uri $uri/ /index.html =404;
+  }
+}
@@ -1,100 +0,0 @@
-
-types {
-    text/html                                        html htm shtml;
-    text/css                                         css;
-    text/xml                                         xml;
-    image/gif                                        gif;
-    image/jpeg                                       jpeg jpg;
-    application/javascript                           js;
-    application/atom+xml                             atom;
-    application/rss+xml                              rss;
-
-    text/mathml                                      mml;
-    text/plain                                       txt;
-    text/plain                                       js;
-    text/vnd.sun.j2me.app-descriptor                 jad;
-    text/vnd.wap.wml                                 wml;
-    text/x-component                                 htc;
-
-    image/avif                                       avif;
-    image/png                                        png;
-    image/svg+xml                                    svg svgz;
-    image/tiff                                       tif tiff;
-    image/vnd.wap.wbmp                               wbmp;
-    image/webp                                       webp;
-    image/x-icon                                     ico;
-    image/x-jng                                      jng;
-    image/x-ms-bmp                                   bmp;
-
-    font/woff                                        woff;
-    font/woff2                                       woff2;
-
-    application/java-archive                         jar war ear;
-    application/json                                 json;
-    application/mac-binhex40                         hqx;
-    application/msword                               doc;
-    application/pdf                                  pdf;
-    application/postscript                           ps eps ai;
-    application/rtf                                  rtf;
-    application/vnd.apple.mpegurl                    m3u8;
-    application/vnd.google-earth.kml+xml             kml;
-    application/vnd.google-earth.kmz                 kmz;
-    application/vnd.ms-excel                         xls;
-    application/vnd.ms-fontobject                    eot;
-    application/vnd.ms-powerpoint                    ppt;
-    application/vnd.oasis.opendocument.graphics      odg;
-    application/vnd.oasis.opendocument.presentation  odp;
-    application/vnd.oasis.opendocument.spreadsheet   ods;
-    application/vnd.oasis.opendocument.text          odt;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation
-                                                     pptx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-                                                     xlsx;
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document
-                                                     docx;
-    application/vnd.wap.wmlc                         wmlc;
-    application/wasm                                 wasm;
-    application/x-7z-compressed                      7z;
-    application/x-cocoa                              cco;
-    application/x-java-archive-diff                  jardiff;
-    application/x-java-jnlp-file                     jnlp;
-    application/x-makeself                           run;
-    application/x-perl                               pl pm;
-    application/x-pilot                              prc pdb;
-    application/x-rar-compressed                     rar;
-    application/x-redhat-package-manager             rpm;
-    application/x-sea                                sea;
-    application/x-shockwave-flash                    swf;
-    application/x-stuffit                            sit;
-    application/x-tcl                                tcl tk;
-    application/x-x509-ca-cert                       der pem crt;
-    application/x-xpinstall                          xpi;
-    application/xhtml+xml                            xhtml;
-    application/xspf+xml                             xspf;
-    application/zip                                  zip;
-
-    application/octet-stream                         bin exe dll;
-    application/octet-stream                         deb;
-    application/octet-stream                         dmg;
-    application/octet-stream                         iso img;
-    application/octet-stream                         msi msp msm;
-
-    audio/midi                                       mid midi kar;
-    audio/mpeg                                       mp3;
-    audio/ogg                                        ogg;
-    audio/x-m4a                                      m4a;
-    audio/x-realaudio                                ra;
-
-    video/3gpp                                       3gpp 3gp;
-    video/mp2t                                       ts;
-    video/mp4                                        mp4;
-    video/mpeg                                       mpeg mpg;
-    video/quicktime                                  mov;
-    video/webm                                       webm;
-    video/x-flv                                      flv;
-    video/x-m4v                                      m4v;
-    video/x-mng                                      mng;
-    video/x-ms-asf                                   asx asf;
-    video/x-ms-wmv                                   wmv;
-    video/x-msvideo                                  avi;
-}
@@ -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;
-    }
-}
@@ -6,8 +6,7 @@
    "start": "ng serve",
    "start-http": "http-server -c-1 dist",
    "build": "ng build",
-    "build-production": "ng build --prod --c=production --output-path dist",
-    "build-staging": "ng build --prod -c=staging --output-path dist",
+    "build-prod": "ng build --prod --output-path dist",
    "test": "ng test",
    "lint": "ng lint",
    "e2e": "ng e2e"
@@ -61,6 +60,6 @@
    "protractor": "~5.4.2",
    "ts-node": "~8.0.3",
    "tslint": "~5.14.0",
-    "typescript": "3.1.1"
+    "typescript": "^3.2.4"
  }
 }
@@ -1,8 +0,0 @@
-export const environment = {
-  production: true,
-  apiUrl: 'https://api.staging.numeris-isep.fr',
-  tokenName: 'numeris_token',
-  savEmail: 'sav.numeris@gmail.com',
-  messengerUrl: 'http://m.me/numerisisep',
-  captchaKey: '6Le3-skUAAAAAFQd5ffXB1PnyQUQDPsgQH4n1neo',
-};
Author	SHA1	Message	Date
marc	80aa16c844	new ports	2022-09-21 16:25:45 +02:00
marc	51eeb3d000	Merge remote-tracking branch 'origin/docker-compose' into front-multistage	2022-09-21 16:20:32 +02:00
marc	08f70a7a61	ci	2022-09-21 11:03:09 +02:00
marc	e844eafd41	opt/numeris	2022-09-21 10:40:50 +02:00
marc	def2fc0335	nginx.conf	2022-09-21 10:37:25 +02:00
marc	ec4a85ecbe	nginx	2022-09-21 10:36:47 +02:00
marc	694f0b0d25	multistage	2022-09-21 10:32:33 +02:00
marc	b54c69ae4c	names are back	2022-09-20 15:18:09 +02:00
marc	ce259181b9	mysql_testing	2022-09-20 14:38:33 +02:00
marc	77ca1911ed	bind mount is back	2022-09-20 14:36:31 +02:00
marc	6533ab3b30	entrypoint is front is a must	2022-09-19 10:59:19 +02:00
marc	5e3dfec004	phpmyadmin might come in handy	2022-09-19 10:32:09 +02:00
marc	b834f1d27b	fix names	2022-09-19 10:27:59 +02:00
marc	3a374a10bc	front too	2022-09-17 17:51:40 +02:00
marc	0378a0a224	front too	2022-09-16 19:54:08 +02:00
marc	a6b9888cfe	production	2022-09-16 19:06:08 +02:00
marc	8f69143715	3.9	2022-09-16 18:43:11 +02:00