Update Dockerfile paths and remove redundant test step

Author: tfirdaus

.github/workflows/wp.yml

@@ -57,31 +57,31 @@ jobs:
           file: ${{ env.IMAGE_FILE }}
           tags: ${{ env.IMAGE_TAG }}
 
-      - name: Test run image
-        run: |
-          ver=$(docker run --rm ${{ env.IMAGE_TAG }} php -v | grep -o "^PHP [0-9].[0-9]");
-
-          if [ "$ver" == "PHP ${{ matrix.version }}" ];
-          then
-            echo $ver;
-          else
-            exit 1;
-          fi
-
       - name: Extract metadata (tags, labels) for Docker
         id: metadata
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.IMAGE_TAG }}
 
       - name: Build and push
-        if: github.ref == 'refs/heads/main'
         uses: docker/build-push-action@v5
         with:
-          context: ${{ env.IMAGE_PATH }}
-          push: true
+          context: .
+          push: ${{ github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
           provenance: false
+          load: true
           file: ${{ env.IMAGE_FILE }}
           tags: ${{ env.IMAGE_TAG }}
           labels: ${{ steps.metadata.outputs.labels }}
           platforms: linux/amd64,linux/arm64
+
+      - name: Test run image
+        run: |
+          ver=$(docker run --rm ${{ env.IMAGE_TAG }} php -v | grep -o "^PHP [0-9].[0-9]");
+
+          if [ "$ver" == "PHP ${{ matrix.version }}" ];
+          then
+            echo $ver;
+          else
+            exit 1;
+          fi

wp/php7.4/Dockerfile

@@ -22,15 +22,15 @@ RUN set -eux; \
   mkdir -p /var/www/html; \
   chown -R www-data:www-data /var/www/html
 
-COPY --chmod=755 ./entrypoint.sh /etc/entrypoint.d/70-wp-core-download.sh
+COPY --chmod=755 entrypoint.sh /etc/entrypoint.d/70-wp-core-download.sh
 COPY --from=wp-cli /usr/local/bin/wp /usr/local/bin/
 
 RUN set -eux; \
   chmod +x /usr/local/bin/wp; \
   mkdir -p /var/www/.wp-cli; \
   chown -R www-data:www-data /var/www/.wp-cli;
 
-COPY --chmod=644 --chown=www-data:www-data ./wp-cli.yml /var/www/.wp-cli/config.yml
+COPY --chmod=644 --chown=www-data:www-data wp-cli.yml /var/www/.wp-cli/config.yml
 
 RUN wp cli info;
 

wp/php8.0/Dockerfile

@@ -22,15 +22,15 @@ RUN set -eux; \
   mkdir -p /var/www/html; \
   chown -R www-data:www-data /var/www/html
 
-COPY --chmod=755 ./entrypoint.sh /etc/entrypoint.d/70-wp-core-download.sh
+COPY --chmod=755 entrypoint.sh /etc/entrypoint.d/70-wp-core-download.sh
 COPY --from=wp-cli /usr/local/bin/wp /usr/local/bin/
 
 RUN set -eux; \
   chmod +x /usr/local/bin/wp; \
   mkdir -p /var/www/.wp-cli; \
   chown -R www-data:www-data /var/www/.wp-cli;
 
-COPY --chmod=644 --chown=www-data:www-data ./wp-cli.yml /var/www/.wp-cli/config.yml
+COPY --chmod=644 --chown=www-data:www-data wp-cli.yml /var/www/.wp-cli/config.yml
 
 RUN wp cli info;
 

wp/php8.1/Dockerfile

@@ -22,15 +22,15 @@ RUN set -eux; \
   mkdir -p /var/www/html; \
   chown -R www-data:www-data /var/www/html
 
-COPY --chmod=755 ./entrypoint.sh /etc/entrypoint.d/70-wp-core-download.sh
+COPY --chmod=755 entrypoint.sh /etc/entrypoint.d/70-wp-core-download.sh
 COPY --from=wp-cli /usr/local/bin/wp /usr/local/bin/
 
 RUN set -eux; \
   chmod +x /usr/local/bin/wp; \
   mkdir -p /var/www/.wp-cli; \
   chown -R www-data:www-data /var/www/.wp-cli;
 
-COPY --chmod=644 --chown=www-data:www-data ./wp-cli.yml /var/www/.wp-cli/config.yml
+COPY --chmod=644 --chown=www-data:www-data wp-cli.yml /var/www/.wp-cli/config.yml
 
 RUN wp cli info;
 

wp/php8.2/Dockerfile

@@ -22,15 +22,15 @@ RUN set -eux; \
   mkdir -p /var/www/html; \
   chown -R www-data:www-data /var/www/html
 
-COPY --chmod=755 ./entrypoint.sh /etc/entrypoint.d/70-wp-core-download.sh
+COPY --chmod=755 entrypoint.sh /etc/entrypoint.d/70-wp-core-download.sh
 COPY --from=wp-cli /usr/local/bin/wp /usr/local/bin/
 
 RUN set -eux; \
   chmod +x /usr/local/bin/wp; \
   mkdir -p /var/www/.wp-cli; \
   chown -R www-data:www-data /var/www/.wp-cli;
 
-COPY --chmod=644 --chown=www-data:www-data ./wp-cli.yml /var/www/.wp-cli/config.yml
+COPY --chmod=644 --chown=www-data:www-data wp-cli.yml /var/www/.wp-cli/config.yml
 
 RUN wp cli info;