Feature/arm

.github/workflows/docker.yml

@@ -60,6 +60,7 @@ jobs:
           context: ./docker
           file: ./docker/Dockerfile
           tags: ${{ steps.prep.outputs.tags }}
+          platforms: linux/amd64,linux/arm64
           build-args: |
             WPSNAPSHOTS_ARCHIVE=${{ steps.prep.outputs.archive }}
           labels: |

docker/Dockerfile

@@ -1,18 +1,34 @@
-FROM 10up/phpfpm
+FROM 10up/wp-php-fpm-dev:7.4-ubuntu AS builder
 
 ARG WPSNAPSHOTS_ARCHIVE
 ENV WPSNAPSHOTS_ARCHIVE $WPSNAPSHOTS_ARCHIVE
 
+USER root
+
 WORKDIR /opt/wpsnapshots
 
-RUN useradd wpsnapshots && \
-    mkdir -p /home/wpsnapshots && \
-    chown -R wpsnapshots:wpsnapshots /home/wpsnapshots && \
-    wget -q -c ${WPSNAPSHOTS_ARCHIVE} -O - | tar -xz --strip 1 && \
-    composer install --no-dev --no-progress && \
-    composer clear-cache && \
-    chown -R wpsnapshots:wpsnapshots /opt/wpsnapshots
+RUN \
+  useradd wpsnapshots && \
+  mkdir -p /home/wpsnapshots && \
+  chown -R wpsnapshots:wpsnapshots /home/wpsnapshots && \
+  wget -q -c ${WPSNAPSHOTS_ARCHIVE} -O - | tar -xz --strip 1 && \
+  composer install --no-dev --no-progress && \
+  composer clear-cache && \
+  chown -R wpsnapshots:wpsnapshots /opt/wpsnapshots
+
+FROM 10up/base-php:7.4-ubuntu
+
+USER root 
+
+WORKDIR /opt/wpsnapshots
 
+COPY --from=builder --chown=wpsnapshots=wpsnapshots /opt/wpsnapshots /opt/wpsnapshots
+RUN \
+  apt-get install mariadb-client -y && apt-get clean all && \
+  useradd wpsnapshots && \
+  mkdir -p /home/wpsnapshots && \
+  chown -R wpsnapshots:wpsnapshots /home/wpsnapshots && \
+  chown -R wpsnapshots:wpsnapshots /opt/wpsnapshots
 COPY entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT [ "/entrypoint.sh" ]