new ports

.github/workflows/docker-build-test.yml

@@ -1,48 +0,0 @@
-name: Docker build test
-
-on:
-  push:
-    branches:
-      - "*"
-      - "!master"
-    # Publish `v1.2.3` tags as releases.
-    tags:
-      - v*
-
-  # Run tests for any PRs.
-  pull_request:
-
-jobs:
-  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: Fake env file
-      run: touch .env
-
-    - name: Build
-      run: docker-compose -f docker-compose.production.yml build back
-
-  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: Fake env file
-      run: touch .env
-
-    - name: Build
-      run: docker-compose -f docker-compose.production.yml build front

.github/workflows/docker.yml

@@ -1,89 +0,0 @@
-name: Docker
-
-on:
-  schedule:
-  - cron: "0 4 * * 0" # run every sunday at 4 am to test if the image builds correctly given that changes of debian or compose packages can break the image
-  push:
-    branches:
-      - "master"
-    # Publish `v1.2.3` tags as releases.
-    tags:
-      - v*
-
-  # Run tests for any PRs.
-  pull_request:
-
-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
-        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: 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

docker-compose.production.yml

@@ -3,6 +3,7 @@ services:
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:latest
+    container_name: numeris_phpmyadmin
     restart: unless-stopped
     ports:
       - 3000:80
@@ -13,22 +14,31 @@ services:
 
   mysql:
     image: mysql:5.7
+    container_name: numeris_mysql
     restart: unless-stopped
     env_file:
       - .env
     volumes:
-    - mysql:/var/lib/mysql
+    - ./var/mysql:/var/lib/mysql
 
   back:
+    container_name: numeris_back
+    restart: unless-stopped
     build:
       context: ./back
       dockerfile: Dockerfile
     env_file:
       - .env
-    links:
-    - mysql
     depends_on:
     - mysql
 
+  front:
+    container_name: numeris_front
+    build:
+      context: ./front
+      dockerfile: Dockerfile
+    depends_on:
+      - back
+
 volumes:
   mysql:

docker-compose.testing.yml

@@ -1,14 +1,27 @@
 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'
-    container_name: numeris_mysql
 
   back:
+    container_name: numeris_back
     build:
       context: ./back
       dockerfile: Dockerfile
@@ -25,4 +38,15 @@ services:
       - mysql
     depends_on:
       - mysql
-    container_name: numeris_back
+
+  front:
+    container_name: numeris_front
+    build:
+      context: ./front
+      dockerfile: Dockerfile
+    ports:
+      - 8000:80
+    links:
+      - back
+    depends_on:
+      - back

front/Dockerfile

@@ -1,18 +1,17 @@
-FROM node:11.15.0
-
-RUN mkdir -p /home/numeris
-
-ENV PATH /home/numeris/node_modules/.bin:$PATH
-
-COPY package*.json /home/numeris/
-
-# npm install
-WORKDIR /home/numeris
-RUN npm install
+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 . /home/numeris
-
+COPY . .
 RUN npm rebuild node-sass
+RUN npm run build-prod
+ENTRYPOINT [ "ng", "s", "--host", "0.0.0.0" ]
 
-WORKDIR /home/numeris
+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

@@ -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;
+  }
+}