Add check for theme's style.css file

Bump lewagon/wait-on-check-action from 1.4.0 to 1.4.1

.github/workflows/image.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       -
         name: checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -49,7 +49,7 @@ jobs:
           password: ${{secrets.PAT_TOKEN}}
       -
         name: Await successful tests
-        uses: lewagon/wait-on-check-action@v1.3.4
+        uses: lewagon/wait-on-check-action@v1.4.1
         with:
           ref: ${{ github.sha }}
           check-name: tests
@@ -57,12 +57,12 @@ jobs:
           wait-interval: 20
       -
         name: Build and push WordPress Web image
-        uses: docker/bake-action@v6.5.0
+        uses: docker/bake-action@v6.9.0
         with:
           files: build/docker-bake.hcl
           push: true
       - name: Build and push WordPress Cron image
-        uses: docker/bake-action@v6.5.0
+        uses: docker/bake-action@v6.9.0
         with:
           files: build/docker-bake-cron.hcl
           push: true

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: "Checkout"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       -
         name: "Set up Docker Buildx"

README.md

@@ -68,12 +68,14 @@ ghcr.io/n0rthernl1ghts/wordpress-cron:6.6.2
 
 Replace version number with desired version, eg. 6.6.1.
 
-### Cron
+#### Cron
 Cron is supported out of the box in `ghcr.io/n0rthernl1ghts/wordpress` image, but the best practice is to use dedicated image `ghcr.io/n0rthernl1ghts/wordpress-cron` for this purpose. <br/>
 This image is optimized for running cron jobs, and is stripped of unnecessary components.
 
 Running cron in the main image is not recommended, as it can cause performance issues, and can lead to unexpected behavior.
 
+#### Plugin installer
+
 ```
 WARNING: This feature is experimental and can fail. Proceed with caution
 ```

build/docker-bake-cron.hcl

@@ -19,7 +19,11 @@ group "default" {
     "6_6_1",
     "6_6_2",
     "6_7_0",
-    "6_7_1"
+    "6_7_1",
+    "6_7_2",
+    "6_8_0",
+    "6_8_1",
+    "6_8_2"
   ]
 }
 
@@ -244,6 +248,38 @@ target "6_7_1" {
   inherits   = ["build-dockerfile", "build-platforms", "build-common"]
   cache-from = get-cache-from("6.7.1")
   cache-to   = get-cache-to("6.7.1")
-  tags       = get-tags("6.7.1", ["6", "6.7", "latest"])
+  tags       = get-tags("6.7.1", [])
   args       = get-args("6.7.1")
+}
+
+target "6_7_2" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("6.7.2")
+  cache-to   = get-cache-to("6.7.2")
+  tags       = get-tags("6.7.2", ["6.7"])
+  args       = get-args("6.7.2")
+}
+
+target "6_8_0" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("6.8.0")
+  cache-to   = get-cache-to("6.8.0")
+  tags       = get-tags("6.8.0", [])
+  args       = get-args("6.8.0")
+}
+
+target "6_8_1" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("6.8.1")
+  cache-to   = get-cache-to("6.8.1")
+  tags       = get-tags("6.8.1", [])
+  args       = get-args("6.8.1")
+}
+
+target "6_8_2" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("6.8.2")
+  cache-to   = get-cache-to("6.8.2")
+  tags       = get-tags("6.8.2", ["6", "6.8", "latest"])
+  args       = get-args("6.8.2")
 }

build/docker-bake.hcl

@@ -20,7 +20,10 @@ group "default" {
     "6_6_2",
     "6_7_0",
     "6_7_1",
-    "6_7_2"
+    "6_7_2",
+    "6_8_0",
+    "6_8_1",
+    "6_8_2"
   ]
 }
 
@@ -253,6 +256,31 @@ target "6_7_2" {
   inherits   = ["build-dockerfile", "build-platforms", "build-common"]
   cache-from = get-cache-from("6.7.2")
   cache-to   = get-cache-to("6.7.2")
-  tags       = get-tags("6.7.2", ["6", "6.7", "latest"])
+  tags       = get-tags("6.7.2", ["6.7"])
   args       = get-args("6.7.2", "6.5.0")
 }
+
+target "6_8_0" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("6.8.0")
+  cache-to   = get-cache-to("6.8.0")
+  tags       = get-tags("6.8.0", [])
+  args       = get-args("6.8.0", "6.5.0")
+}
+
+target "6_8_1" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("6.8.1")
+  cache-to   = get-cache-to("6.8.1")
+  tags       = get-tags("6.8.1", [])
+  args       = get-args("6.8.1", "6.5.0")
+}
+
+target "6_8_2" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("6.8.2")
+  cache-to   = get-cache-to("6.8.2")
+  tags       = get-tags("6.8.2", ["6", "6.8", "latest"])
+  args       = get-args("6.8.2", "6.5.0")
+}
+

build/patch-util/rootfs/wp/entrypoint.sh

@@ -6,7 +6,7 @@ echo "> Downloading WordPress ${WP_VERSION} ..."
 WP_SHORT_VERSION=$(echo "${WP_VERSION}" | sed --expression='s/.0$//g');
 echo "> Short Version: ${WP_SHORT_VERSION}"
 
-wp --allow-root --path="/tmp" core download --locale="${WP_LOCALE}" --version="${WP_SHORT_VERSION}"
+php -d "memory_limit=512M" /usr/local/bin/wp --allow-root --path="/tmp" core download --locale="${WP_LOCALE}" --version="${WP_SHORT_VERSION}"
 
 if [ ! -f "/tmp/wp-admin/update-core.php" ]; then
   echo "X WordPress download failed"

src/wp-utils/wp-theme

@@ -48,11 +48,16 @@ check() {
     local themeSlug="${1:?check: THEME_SLUG is required}"
     local themePath="${themesDir}/${themeSlug}"
 
-    # Check if theme directory exists
+    # Check if theme directory exists - If it doesn't we know immediately that the theme is not installed
     if [ ! -d "${themePath}" ]; then
         return 1
     fi
 
+    # Check if theme style.css exists - if yes, theme is probably installed successfully
+    if [ -f "${themePath}/style.css" ]; then
+        return 0
+    fi
+
     # Check if theme theme.json exists - if yes, theme is probably installed successfully
     if [ -f "${themePath}/theme.json" ]; then
         return 0