better lock

This reverts commit b466e5b6ee.

back/Dockerfile

@@ -17,11 +17,7 @@ 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
 
@@ -29,7 +25,8 @@ WORKDIR /home/numeris
 COPY . .
 
 # Composer install
-RUN composer install --no-interaction
+RUN composer self-update --2
+RUN COMPOSER_MEMORY_LIMIT=-1 composer install --no-interaction
 
 # Final touch
 RUN apt-get clean && \

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

@@ -13,6 +13,6 @@
     Require all granted
   </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>

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.testing.yml

@@ -0,0 +1,58 @@
+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
+    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
+    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:
+    image: numerisisep/numeris-front
+    container_name: numeris_front
+    restart: unless-stopped
+    build:
+      context: ./front
+      dockerfile: Dockerfile
+    ports:
+      - 8000:80
+    links:
+      - back
+    depends_on:
+      - back

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.9"
+version: '3'
 services:
 
   phpmyadmin:
@@ -9,46 +9,50 @@ 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
+      - back/.env
     environment:
-      DB_HOST: ${DB_HOST:-mysql}
-      DB_PORT: ${DB_PORT:-3306}
-      DB_DATABASE: ${DB_DATABASE:-numeris}
-      DB_USERNAME: ${DB_USERNAME:-root}
+      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:-8080}:80
+      - ${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
     volumes:
       - ./front/src:/home/numeris/src
       - /home/numeris/node_modules
+    links:
+      - back
+    expose:
+      - ${FRONT_PORT}
     ports:
-      - ${FRONT_PORT:-4200}:80
-    # command: ng serve --host 0.0.0.0
+      - ${FRONT_PORT}:${FRONT_PORT}
+    command: ng s --host 0.0.0.0
+    container_name: numeris_front

front/Dockerfile

@@ -1,16 +1,10 @@
 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 ./
-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-prod
-
-EXPOSE 80
-ENTRYPOINT [ "ng", "serve", "--host", "0.0.0.0", "--port", "80" ]
+RUN npm rebuild node-sass
+RUN npm run build
+ENTRYPOINT [ "ng", "serve", "--configuration", "production", "--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'