test dev

docker-compose.production.yml

@@ -24,10 +24,13 @@ services:
     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

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.9"
+version: '3'
 services:
 
   phpmyadmin:
@@ -9,46 +9,48 @@ 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_PASSWORD: ${DB_PASSWORD}
+      DB_HOST: mysql
+      DB_PORT: 3306
+      DB_DATABASE: numeris
+      DB_USERNAME: root
+      DB_PASSWORD:
     volumes:
       - ./back:/home/numeris
       - /home/numeris/vendor
     ports:
-      - ${BACK_PORT:-8080}:80
+      - ${BACK_PORT:-8000}: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
     ports:
-      - ${FRONT_PORT:-4200}:80
-    # command: ng serve --host 0.0.0.0
+      - ${FRONT_PORT:-8080}:80
+    command: ng s --host 0.0.0.0
+    container_name: numeris_front

front/Dockerfile

@@ -1,16 +1,9 @@
 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 ./
+COPY package*.json /opt/numeris/
 RUN yarn install
-# RUN yarn add -g @angular/cli@7.3.9
+RUN yarn add -g @angular/cli@7.3.9
 COPY . .
 RUN yarn run build-prod
-
-EXPOSE 80
-ENTRYPOINT [ "ng", "serve", "--host", "0.0.0.0", "--port", "80" ]
+ENTRYPOINT [ "ng", "serve", "--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'