Merge branch 'release/0.18.1'

Author: Kevin Buchholz

.github/dependabot.yml

@@ -6,6 +6,6 @@ updates:
     interval: "daily"
   reviewers:
   - krns
-  - PKuebler
+  - NeroAzure
   assignees:
-  - PKuebler
+  - NeroAzure

.github/workflows/edgeImageBuild.yml

@@ -0,0 +1,35 @@
+name: Build edge image
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            sourceboat/docker-laravel:edge

.github/workflows/stableImageBuild.yml

@@ -0,0 +1,49 @@
+name: Build stable image
+
+on:
+  push:
+    tags:
+      - '*.*.*'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            sourceboat/docker-laravel
+          flavour: |
+            latest=true
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/testImageBuild.yml

@@ -0,0 +1,14 @@
+name: Build test image
+
+on: [pull_request]
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Run tests
+        run: docker-compose -f docker-compose.test.yml run test

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.0.7-fpm-alpine
+FROM php:8.0.8-fpm-alpine
 
 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
     PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \
@@ -78,7 +78,8 @@ COPY ./etc/service/ /etc/service/
 RUN find /etc/service/ -name "run" -exec chmod -v +x {} \;
 
 # copy nginx config files
-COPY ./etc/nginx/ /etc/nginx/
+COPY ./etc/nginx/conf.d/ /etc/nginx/conf.d/
+COPY ./etc/nginx/nginx.conf /etc/nginx/nginx.conf
 
 # copy php config files
 COPY ./usr/local/etc/php/ /usr/local/etc/php/

README.md

@@ -117,6 +117,7 @@ Check [releases](https://github.com/sourceboat/docker-laravel/releases) for all
 
 - [Phil-Bastian Berndt](https://github.com/pehbehbeh)
 - [Philipp Kübler](https://github.com/PKuebler)
+- [Kevin Buchholz](https://github.com/NeroAzure)
 - [All Contributors](https://github.com/sourceboat/docker-laravel/graphs/contributors)
 
 ## License

docker-compose.test.yml

@@ -1,6 +1,6 @@
 version: '3.7'
 services:
-  sut:
+  test:
     build: .
     command: /root/test/test-command.sh
     environment: