Răsfoiți Sursa

Updated PHP 8 Docker image to PHP 8.1

Mark Shust 3 ani în urmă
părinte
comite
248242e28c

+ 34 - 0
.github/workflows/build-php-7.3.yml

@@ -0,0 +1,34 @@
+name: build-php-7.3
+
+on: workflow_dispatch
+
+jobs:
+  php-7-3:
+    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
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: images/php/7.3
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            markoshust/magento-php:7.3-fpm
+            markoshust/magento-php:7.3-fpm-18

+ 34 - 0
.github/workflows/build-php-7.4.yml

@@ -0,0 +1,34 @@
+name: build-php-7.4
+
+on: workflow_dispatch
+
+jobs:
+  php-7-4:
+    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
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: images/php/7.4
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            markoshust/magento-php:7.4-fpm
+            markoshust/magento-php:7.4-fpm-11

+ 33 - 0
.github/workflows/build-php-8.1.yml

@@ -0,0 +1,33 @@
+name: build-php-8.1
+
+on: workflow_dispatch
+
+jobs:
+  php-8-1:
+    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
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: images/php/8.1
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            markoshust/magento-php:8.1-fpm-develop

+ 3 - 3
.github/workflows/build-php.yml

@@ -61,7 +61,7 @@ jobs:
           tags: |
             markoshust/magento-php:7.4-fpm
             markoshust/magento-php:7.4-fpm-11
-  php-8-0:
+  php-8-1:
     runs-on: ubuntu-latest
     steps:
       -
@@ -84,8 +84,8 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v2
         with:
-          context: images/php/8.0
+          context: images/php/8.1
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            markoshust/magento-php:8.0-fpm-develop
+            markoshust/magento-php:8.1-fpm-develop

+ 1 - 1
CHANGELOG.md

@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-- PHP image `8.0-fpm-develop` now available for testing purposes.
+- PHP image `8.1-fpm-develop` now available for testing purposes.
 
 ## [41.0.1] - 2021-11-09
 

+ 2 - 2
README.md

@@ -36,8 +36,8 @@ View Dockerfiles:
       - [`1.18-1`](https://github.com/markshust/docker-magento/tree/31.0.1/images/nginx/1.18)
       - [`1.18-0`](https://github.com/markshust/docker-magento/tree/31.0.0/images/nginx/1.18)
 - [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/)
-  - 8.0 (available for alpha testing)
-      - [`8.0-fpm-develop`](https://github.com/markshust/docker-magento/tree/master/images/php/8.0)
+  - 8.1 (available for alpha testing)
+      - [`8.1-fpm-develop`](https://github.com/markshust/docker-magento/tree/master/images/php/8.1)
   - 7.4
       - [`7.4-fpm`, `7.4-fpm-11`](https://github.com/markshust/docker-magento/tree/master/images/php/7.4)
       - [`7.4-fpm-10`](https://github.com/markshust/docker-magento/tree/40.0.2/images/php/7.4)

+ 1 - 6
images/php/8.0/Dockerfile → images/php/8.1/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.0-fpm-buster
+FROM php:8.1.0RC5-fpm-buster
 MAINTAINER Mark Shust <mark@shust.com>
 
 ARG APP_ID=1000
@@ -78,11 +78,6 @@ COPY conf/msmtprc /etc/msmtprc
 RUN curl -sS https://getcomposer.org/installer | \
   php -- --install-dir=/usr/local/bin --filename=composer
 
-RUN curl -s https://packages.blackfire.io/gpg.key | apt-key add - \
-  && echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
-  && apt-get update \
-  && apt-get install blackfire-agent blackfire-php
-
 COPY conf/www.conf /usr/local/etc/php-fpm.d/
 COPY conf/php.ini /usr/local/etc/php/
 COPY conf/php-fpm.conf /usr/local/etc/

+ 0 - 0
images/php/8.0/conf/msmtprc → images/php/8.1/conf/msmtprc


+ 0 - 0
images/php/8.0/conf/php-fpm.conf → images/php/8.1/conf/php-fpm.conf


+ 0 - 0
images/php/8.0/conf/php.ini → images/php/8.1/conf/php.ini


+ 0 - 0
images/php/8.0/conf/www.conf → images/php/8.1/conf/www.conf