Add builds back into image and update README.md (#44)

brettt89 · Aug 10, 2020 · 9b330e3 · 9b330e3
1 parent 80b8254
commit 9b330e3
Show file tree

Hide file tree

Showing 36 changed files with 1,108 additions and 95 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -3,9 +3,19 @@ on:
   # Trigger the workflow on push or pull request,
   # but only for the master branch
   push:
+    paths-ignore:
+      - 'README.md'
+      - 'docs/'
+      - 'LICENCE'
+      - 'Makefile'
     branches:
       - master
   pull_request:
+    paths-ignore:
+      - 'README.md'
+      - 'docs/'
+      - 'LICENCE'
+      - 'Makefile'
     branches:
       - master
       - release/**
@@ -38,11 +48,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Pull Docker images
-        run: docker-compose pull
-
-      - name: Build Image
-        run: ./build/build-image.sh ${{ matrix.php }}-${{ matrix.distro }}-${{ matrix.os }}
+      - name: Build Images
+        env:
+          TAG: ${{ matrix.php }}-${{ matrix.distro }}-${{ matrix.os }}
+          BUILD_DIR: ${{ matrix.php }}/${{ matrix.distro }}/${{ matrix.os }}
+        run: docker-compose build
 
       - name: Get Composer Cache Directory
         id: composer-data
@@ -63,11 +73,6 @@ jobs:
           COMPOSER_HOME: ${{ steps.composer-data.outputs.dir }}
         run: docker-compose run create-project
 
-      - name: Install Silverstripe test project
-        env:
-          COMPOSER_HOME: ${{ steps.composer-data.outputs.dir }}
-        run: docker-compose run install-project
-
       - name: Run tests
         env:
           TAG: ${{ matrix.php }}-${{ matrix.distro }}-${{ matrix.os }}
@@ -99,11 +104,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Pull Docker images
-        run: docker-compose pull
-
-      - name: Build Image
-        run: ./build/build-image.sh ${{ matrix.php }}-${{ matrix.distro }}-${{ matrix.os }}
+      - name: Build Images
+        env:
+          TAG: ${{ matrix.php }}-${{ matrix.distro }}-${{ matrix.os }}
+          BUILD_DIR: ${{ matrix.php }}/${{ matrix.distro }}/${{ matrix.os }}
+        run: docker-compose build
 
       - name: Get Composer Cache Directory
         id: composer-data
@@ -124,11 +129,6 @@ jobs:
           COMPOSER_HOME: ${{ steps.composer-data.outputs.dir }}
         run: docker-compose run create-project
 
-      - name: Install Silverstripe test project
-        env:
-          COMPOSER_HOME: ${{ steps.composer-data.outputs.dir }}
-        run: docker-compose run install-project
-
       - name: Run tests
         env:
           TAG: ${{ matrix.php }}-${{ matrix.distro }}-${{ matrix.os }}

diff --git a/5.6/apache/jessie/Dockerfile b/5.6/apache/jessie/Dockerfile
@@ -0,0 +1,49 @@
+ARG TAG
+
+FROM php:$TAG
+MAINTAINER Brett Tasker "<brett@silverstripe.com>"
+ENV DEBIAN_FRONTEND=noninteractive
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/install-php-extensions
+
+# Install default PHP Extensions
+RUN install-php-extensions \
+        bcmath \
+        mysqli \
+        pdo \
+        pdo_mysql \
+        intl \
+        ldap \
+        gd \
+        soap \
+        tidy \
+        xsl \
+        zip \
+        exif \
+        gmp
+
+# Pipe errors to stdErr
+RUN echo "date.timezone = Pacific/Auckland" > /usr/local/etc/php/conf.d/timezone.ini && \
+    echo "log_errors = On\nerror_log = /dev/stderr" > /usr/local/etc/php/conf.d/errors.ini
+# Apache configuration
+ENV DOCUMENT_ROOT /var/www/html
+RUN { \
+                echo '<VirtualHost *:80>'; \
+                echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
+                echo '  LogLevel warn'; \
+                echo '  ServerSignature Off'; \
+                echo '  <Directory ${ENVVAR}>'; \
+                echo '    Options +FollowSymLinks'; \
+                echo '    Options -ExecCGI -Includes -Indexes'; \
+                echo '    AllowOverride all'; \
+                echo; \
+                echo '    Require all granted'; \
+                echo '  </Directory>'; \
+                echo '  <LocationMatch assets/>'; \
+                echo '    php_flag engine off'; \
+                echo '  </LocationMatch>'; \
+                echo; \
+                echo '  IncludeOptional sites-available/000-default.local*'; \
+                echo '</VirtualHost>'; \
+	} | tee /etc/apache2/sites-available/000-default.conf && \
+    echo "ServerName localhost" > /etc/apache2/conf-available/fqdn.conf && \
+    a2enmod rewrite expires remoteip cgid headers
diff --git a/5.6/apache/stretch/Dockerfile b/5.6/apache/stretch/Dockerfile
@@ -0,0 +1,49 @@
+ARG TAG
+
+FROM php:$TAG
+MAINTAINER Brett Tasker "<brett@silverstripe.com>"
+ENV DEBIAN_FRONTEND=noninteractive
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/install-php-extensions
+
+# Install default PHP Extensions
+RUN install-php-extensions \
+        bcmath \
+        mysqli \
+        pdo \
+        pdo_mysql \
+        intl \
+        ldap \
+        gd \
+        soap \
+        tidy \
+        xsl \
+        zip \
+        exif \
+        gmp
+
+# Pipe errors to stdErr
+RUN echo "date.timezone = Pacific/Auckland" > /usr/local/etc/php/conf.d/timezone.ini && \
+    echo "log_errors = On\nerror_log = /dev/stderr" > /usr/local/etc/php/conf.d/errors.ini
+# Apache configuration
+ENV DOCUMENT_ROOT /var/www/html
+RUN { \
+                echo '<VirtualHost *:80>'; \
+                echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
+                echo '  LogLevel warn'; \
+                echo '  ServerSignature Off'; \
+                echo '  <Directory ${ENVVAR}>'; \
+                echo '    Options +FollowSymLinks'; \
+                echo '    Options -ExecCGI -Includes -Indexes'; \
+                echo '    AllowOverride all'; \
+                echo; \
+                echo '    Require all granted'; \
+                echo '  </Directory>'; \
+                echo '  <LocationMatch assets/>'; \
+                echo '    php_flag engine off'; \
+                echo '  </LocationMatch>'; \
+                echo; \
+                echo '  IncludeOptional sites-available/000-default.local*'; \
+                echo '</VirtualHost>'; \
+	} | tee /etc/apache2/sites-available/000-default.conf && \
+    echo "ServerName localhost" > /etc/apache2/conf-available/fqdn.conf && \
+    a2enmod rewrite expires remoteip cgid headers
diff --git a/5.6/cli/jessie/Dockerfile b/5.6/cli/jessie/Dockerfile
@@ -0,0 +1,26 @@
+ARG TAG
+
+FROM php:$TAG
+MAINTAINER Brett Tasker "<brett@silverstripe.com>"
+ENV DEBIAN_FRONTEND=noninteractive
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/install-php-extensions
+
+# Install default PHP Extensions
+RUN install-php-extensions \
+        bcmath \
+        mysqli \
+        pdo \
+        pdo_mysql \
+        intl \
+        ldap \
+        gd \
+        soap \
+        tidy \
+        xsl \
+        zip \
+        exif \
+        gmp
+
+# Pipe errors to stdErr
+RUN echo "date.timezone = Pacific/Auckland" > /usr/local/etc/php/conf.d/timezone.ini && \
+    echo "log_errors = On\nerror_log = /dev/stderr" > /usr/local/etc/php/conf.d/errors.ini
diff --git a/5.6/cli/stretch/Dockerfile b/5.6/cli/stretch/Dockerfile
@@ -0,0 +1,26 @@
+ARG TAG
+
+FROM php:$TAG
+MAINTAINER Brett Tasker "<brett@silverstripe.com>"
+ENV DEBIAN_FRONTEND=noninteractive
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/install-php-extensions
+
+# Install default PHP Extensions
+RUN install-php-extensions \
+        bcmath \
+        mysqli \
+        pdo \
+        pdo_mysql \
+        intl \
+        ldap \
+        gd \
+        soap \
+        tidy \
+        xsl \
+        zip \
+        exif \
+        gmp
+
+# Pipe errors to stdErr
+RUN echo "date.timezone = Pacific/Auckland" > /usr/local/etc/php/conf.d/timezone.ini && \
+    echo "log_errors = On\nerror_log = /dev/stderr" > /usr/local/etc/php/conf.d/errors.ini
diff --git a/5.6/fpm/jessie/Dockerfile b/5.6/fpm/jessie/Dockerfile
@@ -0,0 +1,26 @@
+ARG TAG
+
+FROM php:$TAG
+MAINTAINER Brett Tasker "<brett@silverstripe.com>"
+ENV DEBIAN_FRONTEND=noninteractive
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/install-php-extensions
+
+# Install default PHP Extensions
+RUN install-php-extensions \
+        bcmath \
+        mysqli \
+        pdo \
+        pdo_mysql \
+        intl \
+        ldap \
+        gd \
+        soap \
+        tidy \
+        xsl \
+        zip \
+        exif \
+        gmp
+
+# Pipe errors to stdErr
+RUN echo "date.timezone = Pacific/Auckland" > /usr/local/etc/php/conf.d/timezone.ini && \
+    echo "log_errors = On\nerror_log = /dev/stderr" > /usr/local/etc/php/conf.d/errors.ini
diff --git a/5.6/fpm/stretch/Dockerfile b/5.6/fpm/stretch/Dockerfile
@@ -0,0 +1,26 @@
+ARG TAG
+
+FROM php:$TAG
+MAINTAINER Brett Tasker "<brett@silverstripe.com>"
+ENV DEBIAN_FRONTEND=noninteractive
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/install-php-extensions
+
+# Install default PHP Extensions
+RUN install-php-extensions \
+        bcmath \
+        mysqli \
+        pdo \
+        pdo_mysql \
+        intl \
+        ldap \
+        gd \
+        soap \
+        tidy \
+        xsl \
+        zip \
+        exif \
+        gmp
+
+# Pipe errors to stdErr
+RUN echo "date.timezone = Pacific/Auckland" > /usr/local/etc/php/conf.d/timezone.ini && \
+    echo "log_errors = On\nerror_log = /dev/stderr" > /usr/local/etc/php/conf.d/errors.ini
diff --git a/7.1/apache/buster/Dockerfile b/7.1/apache/buster/Dockerfile
@@ -0,0 +1,49 @@
+ARG TAG
+
+FROM php:$TAG
+MAINTAINER Brett Tasker "<brett@silverstripe.com>"
+ENV DEBIAN_FRONTEND=noninteractive
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/install-php-extensions
+
+# Install default PHP Extensions
+RUN install-php-extensions \
+        bcmath \
+        mysqli \
+        pdo \
+        pdo_mysql \
+        intl \
+        ldap \
+        gd \
+        soap \
+        tidy \
+        xsl \
+        zip \
+        exif \
+        gmp
+
+# Pipe errors to stdErr
+RUN echo "date.timezone = Pacific/Auckland" > /usr/local/etc/php/conf.d/timezone.ini && \
+    echo "log_errors = On\nerror_log = /dev/stderr" > /usr/local/etc/php/conf.d/errors.ini
+# Apache configuration
+ENV DOCUMENT_ROOT /var/www/html
+RUN { \
+                echo '<VirtualHost *:80>'; \
+                echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
+                echo '  LogLevel warn'; \
+                echo '  ServerSignature Off'; \
+                echo '  <Directory ${ENVVAR}>'; \
+                echo '    Options +FollowSymLinks'; \
+                echo '    Options -ExecCGI -Includes -Indexes'; \
+                echo '    AllowOverride all'; \
+                echo; \
+                echo '    Require all granted'; \
+                echo '  </Directory>'; \
+                echo '  <LocationMatch assets/>'; \
+                echo '    php_flag engine off'; \
+                echo '  </LocationMatch>'; \
+                echo; \
+                echo '  IncludeOptional sites-available/000-default.local*'; \
+                echo '</VirtualHost>'; \
+	} | tee /etc/apache2/sites-available/000-default.conf && \
+    echo "ServerName localhost" > /etc/apache2/conf-available/fqdn.conf && \
+    a2enmod rewrite expires remoteip cgid headers
diff --git a/7.1/apache/jessie/Dockerfile b/7.1/apache/jessie/Dockerfile
@@ -0,0 +1,49 @@
+ARG TAG
+
+FROM php:$TAG
+MAINTAINER Brett Tasker "<brett@silverstripe.com>"
+ENV DEBIAN_FRONTEND=noninteractive
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/install-php-extensions
+
+# Install default PHP Extensions
+RUN install-php-extensions \
+        bcmath \
+        mysqli \
+        pdo \
+        pdo_mysql \
+        intl \
+        ldap \
+        gd \
+        soap \
+        tidy \
+        xsl \
+        zip \
+        exif \
+        gmp
+
+# Pipe errors to stdErr
+RUN echo "date.timezone = Pacific/Auckland" > /usr/local/etc/php/conf.d/timezone.ini && \
+    echo "log_errors = On\nerror_log = /dev/stderr" > /usr/local/etc/php/conf.d/errors.ini
+# Apache configuration
+ENV DOCUMENT_ROOT /var/www/html
+RUN { \
+                echo '<VirtualHost *:80>'; \
+                echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
+                echo '  LogLevel warn'; \
+                echo '  ServerSignature Off'; \
+                echo '  <Directory ${ENVVAR}>'; \
+                echo '    Options +FollowSymLinks'; \
+                echo '    Options -ExecCGI -Includes -Indexes'; \
+                echo '    AllowOverride all'; \
+                echo; \
+                echo '    Require all granted'; \
+                echo '  </Directory>'; \
+                echo '  <LocationMatch assets/>'; \
+                echo '    php_flag engine off'; \
+                echo '  </LocationMatch>'; \
+                echo; \
+                echo '  IncludeOptional sites-available/000-default.local*'; \
+                echo '</VirtualHost>'; \
+	} | tee /etc/apache2/sites-available/000-default.conf && \
+    echo "ServerName localhost" > /etc/apache2/conf-available/fqdn.conf && \
+    a2enmod rewrite expires remoteip cgid headers