Merge branch 'docker-compose' into php7.4+github-action+docker-compose

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

@@ -0,0 +1,48 @@
+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

@@ -0,0 +1,40 @@
+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:
+    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 Docker images
+      uses: docker/build-push-action@v3
+      with:
+        context: back
+        dockerfile: Dockerfile.production
+        push: true
+        tags: marcpartensky/numeris-back:latest

back/Dockerfile

@@ -21,7 +21,7 @@ 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
 
-WORKDIR /home/numeris
+WORKDIR /opt/numeris
 COPY . .
 
 # Composer install
@@ -31,7 +31,5 @@ RUN composer install --no-interaction
 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 /opt/numeris
 RUN chown -R www-data:www-data /var/log/apache2/
-
-ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]

back/Dockerfile.production

@@ -19,7 +19,7 @@ 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
 
-WORKDIR /home/numeris
+WORKDIR /opt/numeris
 COPY . .
 
 ### Back config ###
@@ -29,10 +29,8 @@ RUN composer install --optimize-autoloader --no-dev --no-interaction
 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 /opt/numeris
 RUN chown -R www-data:www-data /var/log/apache2/
 
 RUN php artisan config:cache
 RUN php artisan route:cache
-
-ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]

back/entrypoint.sh

@@ -1,8 +0,0 @@
-#!/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

@@ -20,15 +20,22 @@ services:
     - mysql:/var/lib/mysql
 
   back:
+    restart: unless-stopped
     build:
       context: ./back
       dockerfile: Dockerfile
     env_file:
       - .env
-    links:
-    - mysql
     depends_on:
     - mysql
 
+  front:
+    build:
+      context: ./front
+      dockerfile: Dockerfile
+    depends_on:
+      - back
+    entrypoint: ng s --host 0.0.0.0
+
 volumes:
   mysql:

docker-compose.testing.yml

@@ -1,14 +1,25 @@
 version: '3'
 services:
 
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin:latest
+    container_name: numeris_phpmyadmin
+    ports:
+      - 3000:80
+    links:
+      - mysql:db
+    depends_on:
+      - 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 +36,15 @@ services:
       - mysql
     depends_on:
       - mysql
-    container_name: numeris_back
+
+  front:
+    container_name: numeris_front
+    build:
+      context: ./front
+      dockerfile: Dockerfile
+    ports:
+      - 4200:4200
+    links:
+      - back
+    depends_on:
+      - back

front/Dockerfile

@@ -1,16 +1,18 @@
 FROM node:11.15.0
 
-WORKDIR /home/numeris
+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
 RUN npm install -g @angular/cli@7.3.9
 
-COPY . .
+COPY . /home/numeris
 
 RUN npm rebuild node-sass
 
-ENTRYPOINT [ "ng", "s", "--host", "0.0.0.0" ]
+WORKDIR /home/numeris