Merge branch 'release/0.6.2'

eliashaeussler · Dec 27, 2021 · bc2ea03 · bc2ea03
2 parents 71e5004 + ac77d12
commit bc2ea03
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -6,7 +6,6 @@ on:
 
 jobs:
   deploy:
-    name: Composer ${{ matrix.composer-version }}
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-20.04
     steps:

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,9 @@
-FROM composer:2
+FROM composer:2 AS composer
 LABEL maintainer="Elias Häußler <[email protected]>"
 
+FROM php:8.0-alpine
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+
 ADD . /app
 WORKDIR /app
 RUN composer install --no-dev
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ on: @@
     jobs:
       deploy:
-        name: Composer ${{ matrix.composer-version }}
         if: startsWith(github.ref, 'refs/tags/')
         runs-on: ubuntu-20.04
         steps:
@@ Expand Down @@