Refactored some dockerfile (#16)

* Refactored some dockerfile

Author: chrisleekr

.github/workflows/main.yml

@@ -20,11 +20,6 @@ jobs:
  - name: docker hub login
  run: |
  echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin $REGISTRY_DOMAIN
- - name: Build nginx image
- run: |
- cd nginx
- docker build . -t $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:nginx-dev
- docker push $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:nginx-dev
  - name: Build api dev image
  run: |
  cd api
@@ -38,12 +33,12 @@ jobs:
  - name: Build frontend vue dev image
  run: |
  cd frontend-vue
- docker build . --target build-stage --build-arg NODE_ENV=$NODE_ENV --build-arg BASE_URL=/frontend-vue/ -t $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:frontend-vue-dev
+ docker build . --target build-stage --build-arg NODE_ENV=development --build-arg BASE_URL=/frontend-vue/ -t $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:frontend-vue-dev
  docker push $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:frontend-vue-dev
  - name: Build backend dev image
  run: |
  cd backend
- docker build . --target build-stage --build-arg NODE_ENV=$NODE_ENV --build-arg BASE_URL=/backend/ -t $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:backend-dev
+ docker build . --target build-stage --build-arg NODE_ENV=development --build-arg BASE_URL=/backend/ -t $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:backend-dev
  docker push $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:backend-dev
  - name: Build mysql dev image
  run: |
@@ -81,12 +76,6 @@ jobs:
  - name: Unit test frontend nuxt
  run: |
  docker exec frontend-nuxt npm run test
- - name: Build nginx image
- if: github.ref == 'refs/heads/master'
- run: |
- cd nginx
- docker build . -t $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:nginx-latest
- docker push $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:nginx-latest
  - name: Build api latest image
  if: github.ref == 'refs/heads/master'
  run: |

.gitlab-ci.yml

@@ -4,7 +4,7 @@ stages:
  - build production
 
 cache:
- key: '$CI_PIPELINE_ID'
+ key: "$CI_PIPELINE_ID"
  paths:
  - /root/.cache
  - /root/.npm
@@ -14,15 +14,6 @@ cache:
  before_script:
  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin $REGISTRY_DOMAIN
 
-build-nginx:
- stage: build dev environment
- image: docker:stable
- <<: *before-script
- script:
- - cd nginx
- - docker build . -t $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:nginx-dev
- - docker push $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:nginx-dev
-
 build-api:
  stage: build dev environment
  image: docker:stable
@@ -158,12 +149,3 @@ production-mysql:
  - cd mysql
  - docker build . -t $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:mysql-latest
  - docker push $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:mysql-latest
-
-production-nginx:
- stage: build production
- image: docker:stable
- <<: *before-script
- script:
- - cd nginx
- - docker build . -t $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:nginx-latest
- - docker push $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:nginx-latest

backend/Dockerfile

@@ -30,11 +30,11 @@ ARG BASE_URL
 ENV NODE_ENV=${NODE_ENV}
 ENV BASE_URL=${BASE_URL}
 
-WORKDIR /srv
-
 # Add configuration files
 COPY image-files/ /
 
+WORKDIR /srv
+
 COPY . .
 
 RUN npm run build --mode=production
@@ -47,10 +47,7 @@ FROM nginx:stable-alpine AS production-stage
 # Add configuration files
 COPY image-files/ /
 
-RUN chmod +x /usr/local/bin/docker-entrypoint*.sh
-ENV PATH /usr/local/bin:$PATH
-
-COPY --from=build-stage /srv/dist /srv/backend/
+COPY --from=build-stage /srv/dist /srv
 
 EXPOSE 80
 

backend/image-files/etc/nginx/nginx.conf

@@ -31,19 +31,19 @@ http {
 
  root /srv/;
 
- location ^~ /backend {
+ location ^~ / {
  expires -1;
  add_header Pragma "no-cache";
  add_header Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
- 
- try_files $uri $uri/ /backend/index.html = 404;
+
+ try_files $uri $uri/ /index.html = 404;
  }
 
  #error_page 404 /404.html;
 
  # redirect server error pages to the static page /50x.html
  #
- 
+
  error_page 500 502 503 504 /50x.html;
  location = /50x.html {
  root /srv;

backend/image-files/usr/local/bin/docker-entrypoint.dev.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-mkdir -p /srv/public/static
+mkdir -p /srv/static
 
 cat <<EOT > /srv/public/static/config.json
 {

backend/image-files/usr/local/bin/docker-entrypoint.sh

@@ -2,9 +2,9 @@
 
 set -e
 
-mkdir -p /srv/backend/static
+mkdir -p /srv/static
 
-cat <<EOT > /srv/backend/static/config.json
+cat <<EOT > /srv/static/config.json
 {
  "apiUrl": "$API_URL",
  "format": {

docker-compose.actions.yml

@@ -1,11 +1,20 @@
-version: '3.7'
+version: "3.7"
 
 services:
  nginx:
  container_name: nginx
- image: $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:nginx-dev
+ image: nginx:stable
+ depends_on:
+ - api
+ - frontend-nuxt
+ - frontend-vue
+ - mysql
  networks:
  - internal
+ volumes:
+ - ./nginx/image-files/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
+ ports:
+ - 80:80
 
  api:
  container_name: api

docker-compose.prod.yml

@@ -1,14 +1,20 @@
-version: '3.7'
+version: "3.7"
 
 services:
  nginx:
  container_name: nginx
- image: $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:nginx-latest
- ports:
- - '80:80'
- - '443:443'
+ image: nginx:stable
+ depends_on:
+ - api
+ - frontend-nuxt
+ - frontend-vue
+ - mysql
  networks:
  - internal
+ volumes:
+ - ./nginx/image-files/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
+ ports:
+ - 80:80
 
  api:
  container_name: api

docker-compose.yml

@@ -1,19 +1,18 @@
-version: '3.7'
+version: "3.7"
 
 services:
  nginx:
  container_name: nginx
+ image: nginx:stable
  depends_on:
  - api
  - frontend-nuxt
+ - frontend-vue
  - mysql
- build:
- context: ./nginx
  networks:
  - internal
  volumes:
  - ./nginx/image-files/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
- - ./nginx:/etc/nginx/html
  ports:
  - 80:80
 
@@ -99,6 +98,7 @@ services:
  networks:
  - internal
  environment:
+ - BASE_URL=/backend/
  - API_URL=http://localhost/api
 
  mysql:

frontend-nuxt/Dockerfile

@@ -48,6 +48,4 @@ EXPOSE 3000
 
 ENTRYPOINT [ "docker-entrypoint.sh" ]
 
-RUN npm run build
-
 CMD ["npm", "start"]