Merge pull request #78 from FriendsOfREDAXO/schuer-docs

Docs
FriendsOfREDAXO · Dec 30, 2023 · f7d5037 · f7d5037
2 parents 666b429 + 6728a19
commit f7d5037
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -22,6 +22,8 @@ jobs:
   collect:
     name: Collect images from directories
     runs-on: ubuntu-latest
+    # Map step outputs to job outputs, so that the data can be used in upcoming jobs
+    # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idoutputs
     outputs:
       IMAGES: ${{ steps.images.outputs.directories }}
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,6 +15,8 @@ jobs:
   collect:
     name: Collect images from directories
     runs-on: ubuntu-latest
+    # Map step outputs to job outputs, so that the data can be used in upcoming jobs
+    # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idoutputs
     outputs:
       IMAGES: ${{ steps.images.outputs.directories }}
 

diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Publish](https://github.com/FriendsOfREDAXO/docker-redaxo/actions/workflows/publish.yml/badge.svg)](https://github.com/FriendsOfREDAXO/docker-redaxo/actions/workflows/publish.yml)
+
 # Docker image for REDAXO
 
 This image for [REDAXO](https://github.com/redaxo/redaxo/) CMS is developed and maintained by [Friends Of REDAXO](https://github.com/FriendsOfREDAXO).

diff --git a/images/5-edge/Dockerfile b/images/5-edge/Dockerfile
@@ -62,7 +62,7 @@ RUN set -ex; \
     pdo_mysql \
     zip \
   ; \
-  # install imagick
+  # install imagick (currently disabled due to issues with PHP 8.2/8.3)
   # https://pecl.php.net/package/imagick
   # pecl install imagick-3.7.0; \
   # 	docker-php-ext-enable imagick; \

diff --git a/images/5-stable/Dockerfile b/images/5-stable/Dockerfile
@@ -62,7 +62,7 @@ RUN set -ex; \
     pdo_mysql \
     zip \
   ; \
-  # install imagick
+  # install imagick (currently disabled due to issues with PHP 8.2/8.3)
   # https://pecl.php.net/package/imagick
   # pecl install imagick-3.7.0; \
   # 	docker-php-ext-enable imagick; \

diff --git a/source/Dockerfile b/source/Dockerfile
@@ -62,7 +62,7 @@ RUN set -ex; \
     pdo_mysql \
     zip \
   ; \
-  # install imagick
+  # install imagick (currently disabled due to issues with PHP 8.2/8.3)
   # https://pecl.php.net/package/imagick
   # pecl install imagick-3.7.0; \
   # 	docker-php-ext-enable imagick; \

diff --git a/source/images.yml b/source/images.yml
@@ -1,3 +1,12 @@
+# Images configuration
+#
+# Variants:
+# `5-stable`: stable REDAXO + the oldest PHP version with active support (https://www.php.net/supported-versions.php)
+# `5-edge`  : latest REDAXO (even beta) + latest PHP version (even RC)
+#
+# How to get the sha for a package:
+# `curl -Ls https://github.com/redaxo/redaxo/releases/download/5.15.1/redaxo_5.15.1.zip | shasum`
+
 images:
   - name: "5-stable"
     tags: