home is back instead of opt

.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

back/Dockerfile

@@ -1,6 +1,4 @@
-FROM php:7.2-apache
-
-RUN mkdir -p /home/numeris
+FROM php:7.4-apache
 
 # Install packages
 RUN apt-get update && apt-get install -y \
@@ -8,7 +6,9 @@ RUN apt-get update && apt-get install -y \
     zip \
     unzip \
     nano \
-    libpng-dev
+    libpng-dev \
+    libzip-dev
+
 
 # Install the PHP mcrypt pdo_mysql extension
 RUN docker-php-ext-install pdo_mysql gd zip
@@ -21,18 +21,17 @@ RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && se
 # Enable php conf
 COPY docker/php/php.ini /usr/local/etc/php/conf.d/default.ini
 
-COPY . /home/numeris
+WORKDIR /home/numeris
+COPY . .
 
 # 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/
 
-WORKDIR /home/numeris
+ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]

back/Dockerfile.production

@@ -1,6 +1,4 @@
-FROM php:7.2-apache
-
-RUN mkdir -p /home/numeris
+FROM php:7.4-apache
 
 # Install packages
 RUN apt-get update && apt-get install -y \
@@ -8,7 +6,8 @@ RUN apt-get update && apt-get install -y \
     zip \
     unzip \
     nano \
-    libpng-dev
+    libpng-dev \
+    libzip-dev
 
 # Install the PHP mcrypt pdo_mysql extension
 RUN docker-php-ext-install pdo_mysql gd zip
@@ -20,21 +19,20 @@ RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && se
 # Enable php conf
 COPY docker/php/php.ini /usr/local/etc/php/conf.d/default.ini
 
-COPY . /home/numeris
+WORKDIR /home/numeris
+COPY . .
 
 ### 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" ]

back/entrypoint.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+php artisan key:generate --force
+php artisan jwt:secret --force
+php artisan migrate:refresh --seed --force
+
+docker-php-entrypoint
+apache2-foreground

docker-compose.production.yml

@@ -1,42 +1,34 @@
-version: '3'
+version: "3.9"
 services:
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:latest
+    restart: unless-stopped
     ports:
       - 3000:80
     links:
       - mysql:db
     depends_on:
       - mysql
-    container_name: numeris_phpmyadmin
 
   mysql:
     image: mysql:5.7
-    environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_DATABASE: 'numeris'
+    restart: unless-stopped
+    env_file:
+      - .env
     volumes:
-    - ./var/mysql:/var/lib/mysql
-    container_name: numeris_mysql
+    - mysql:/var/lib/mysql
 
   back:
     build:
       context: ./back
-      dockerfile: Dockerfile.production
-    environment:
-      APP_ENV: production
-      APP_DEBUG: 'false'
-      DB_CONNECTION: mysql
-      DB_HOST: ${DB_HOST}
-      DB_PORT: ${DB_PORT}
-      DB_DATABASE: ${DB_DATABASE}
-      DB_USERNAME: ${DB_USERNAME}
-      DB_PASSWORD: ${DB_PASSWORD}
-    ports:
-      - ${BACK_PORT}:80
+      dockerfile: Dockerfile
+    env_file:
+      - .env
     links:
     - mysql
     depends_on:
     - mysql
-    container_name: numeris_back
+
+volumes:
+  mysql:

front/Dockerfile

@@ -1,18 +1,16 @@
 FROM node:11.15.0
 
-RUN mkdir -p /home/numeris
-
+WORKDIR /home/numeris
 ENV PATH /home/numeris/node_modules/.bin:$PATH
 
 COPY package*.json /home/numeris/
 
 # npm install
-WORKDIR /home/numeris
 RUN npm install
 RUN npm install -g @angular/cli@7.3.9
 
-COPY . /home/numeris
+COPY . .
 
 RUN npm rebuild node-sass
 
-WORKDIR /home/numeris
+ENTRYPOINT [ "ng", "s", "--host", "0.0.0.0" ]