Use Debian Jessie and support Cypress

Author: decafdennis

.circleci/config.yml

@@ -39,8 +39,8 @@ jobs:
           name: Push image to Docker Hub
           command: |
             REPO="digdep/drupal-base"
-            VERSION_MAJOR="3"
-            VERSION_MINOR="3"
+            VERSION_MAJOR="4"
+            VERSION_MINOR="0"
             TAG_PREFIX=$([ "$CIRCLE_BRANCH" = "master" ] && echo || echo "${CIRCLE_BRANCH}-")
             TAG_LATEST="$REPO:${TAG_PREFIX}latest"
             TAG_MAJOR="$REPO:${TAG_PREFIX}${VERSION_MAJOR}"

Dockerfile

@@ -1,154 +1,84 @@
-FROM alpine:3.7
+# Based on buildpack-deps:jessie (as of Dec 2017).
+FROM node:8
 
-ENV NGINX_VERSION 1.12.2
-ENV PHP_VERSION 7.1.12
+ENV NGINX_GPGKEY 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
+ENV SURY_PHP_GPGKEY DF3D585DB8F0EB658690A554AC0E47584A7A714D
 
 WORKDIR /root
 
-# Install runtime dependencies.
-RUN apk add --no-cache \
-# NGINX runtime dependencies.
-    pcre \
-    zlib \
-    openssl \
-# PHP runtime dependencies.
-    pcre \
-    zlib \
-    openssl \
-    libcurl \
-    libedit \
-    libxml2 \
-    libjpeg-turbo \
-    libpng \
-    libzip
-
-# Build stuff.
-RUN apk add --no-cache --virtual .build-deps \
+RUN apt-get update \
+  && apt-get install -y lsb-release ca-certificates apt-transport-https \
+  && apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys $NGINX_GPGKEY $SURY_PHP_GPGKEY \
+  && echo deb http://nginx.org/packages/debian/ $(lsb_release -sc) nginx >> /etc/apt/sources.list \
+  && echo deb https://packages.sury.org/php/ $(lsb_release -sc) main >> /etc/apt/sources.list \
+  && apt-get update \
+  && apt-get install --no-install-suggests --no-install-recommends -y \
+    # Human dependencies.
+    less \
     curl \
-    build-base \
-# NGINX build dependencies.
-    pcre-dev \
-    zlib-dev \
-    openssl-dev \
-# PHP build dependencies.
-    autoconf \
-    pcre-dev \
-    curl-dev \
-    libedit-dev \
-    libxml2-dev \
-    openssl-dev \
-    libjpeg-turbo-dev \
-    libpng-dev \
-    libzip-dev \
-# Build NGINX.
-  && curl -fL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz | tar -xz \
-  && cd nginx-$NGINX_VERSION \
-  && ./configure \
-    --prefix=/etc/nginx \
-    --sbin-path=/usr/sbin/nginx \
-    --modules-path=/usr/lib/nginx/modules \
-    --conf-path=/etc/nginx/nginx.conf \
-    --error-log-path=/var/log/nginx/error.log \
-    --http-log-path=/var/log/nginx/access.log \
-    --pid-path=/var/run/nginx.pid \
-    --lock-path=/var/run/nginx.lock \
-    --http-client-body-temp-path=/var/cache/nginx/client_temp \
-    --http-proxy-temp-path=/var/cache/nginx/proxy_temp \
-    --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \
-    --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \
-    --http-scgi-temp-path=/var/cache/nginx/scgi_temp \
-    --with-http_ssl_module \
-  && make \
-  && make install \
-  && cd .. \
-  && rm -rf nginx-$NGINX_VERSION \
-# Build PHP.
-  && curl -fL https://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror | tar -xj \
-  && cd php-$PHP_VERSION \
-  && ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-config-file-path=/etc/php \
-    --with-config-file-scan-dir=/etc/php/conf.d \
-    --disable-cgi \
-    --enable-phpdbg=no \
-    --enable-fpm \
-    --enable-opcache \
-    --enable-mbstring \
-    --with-mysqli \
-    --with-pdo-mysql \
-    --enable-exif \
-    --with-pcre-regex=/usr \
-    --with-zlib \
-    --with-openssl \
-    --with-curl \
-    --with-libedit \
-    --with-gd \
-    --with-jpeg-dir=/usr \
-    --with-png-dir=/usr \
-    --enable-zip \
-  && make \
-  && make install \
-  && cd .. \
-  && rm -rf php-$PHP_VERSION \
-# Build PHP extensions.
-  && pecl install xdebug \
-# Clean up.
-  && apk del .build-deps
-
-RUN apk add --no-cache \
     vim \
-    curl \
-    supervisor \
-# JavaScript workflow dependencies.
-    nodejs \
-    nodejs-npm \
-    yarn \
-# Drush runtime dependencies.
+    # Drush dependencies.
     mysql-client \
-# CircleCI dependencies.
+    # CircleCI dependencies.
     git \
     openssh-client \
-    tar \
+    tar \ 
     gzip \
-    ca-certificates
+    ca-certificates \
+    # Cypress dependencies.
+    libgtk2.0-0 \
+    libnotify-dev \
+    libgconf-2-4 \
+    libnss3 \
+    libxss1 \
+    libasound2 \
+    xvfb \
+    libxtst6 \
+    # Web server packages.
+    supervisor \
+    nginx \
+    php7.1-fpm \
+    php7.1-cli \
+    php7.1-curl \
+    php7.1-json \
+    php7.1-gd \
+    php7.1-mbstring \
+    php7.1-mysql \
+    php7.1-opcache \
+    php7.1-readline \
+    php7.1-sqlite3 \
+    php7.1-xml \
+    php7.1-zip \
+    # TODO: Install Xdebug?
+  && rm -rf /var/lib/apt/lists/* \
+  && apt-get purge -y --auto-remove
 
 RUN curl -fL https://getcomposer.org/installer | php -- \
     --install-dir=/usr/local/bin \
     --filename=composer
+RUN composer global require --no-plugins --no-scripts \
+    drush/drush \
+    pantheon-systems/terminus
 
-RUN adduser -D drupal
-
-RUN su drupal -c 'composer global require drush/drush'
-RUN su drupal -c 'composer global require pantheon-systems/terminus'
-
-COPY root/etc/supervisord.conf /etc/
+COPY supervisord.conf /etc/supervisor/supervisord.conf
 
-RUN mkdir -p /var/cache/nginx \
-  && mkdir -p /var/log/nginx \
-  && chown drupal:drupal /var/cache/nginx /var/log/nginx \
-  && ln -sf /dev/stdout /var/log/nginx/access.log \
+RUN ln -sf /dev/stdout /var/log/nginx/access.log \
   && ln -sf /dev/stderr /var/log/nginx/error.log
-COPY root/etc/nginx/nginx.conf /etc/nginx/
+COPY nginx.conf /etc/nginx/nginx.conf
 
-COPY root/etc/php/conf.d/*.ini /etc/php/conf.d/
-COPY root/etc/php-fpm.conf /etc/
+COPY php-fpm.conf /etc/php/7.1/fpm/php-fpm.conf
 
 RUN mkdir -p /projects/drupal/web
-COPY root/projects/drupal/web/index.php /projects/drupal/web
-RUN chown -R drupal:drupal /projects
+COPY index.php /projects/drupal/web/index.php
 
-RUN mkdir -p /home/drupal/.drush
-COPY root/home/drupal/.drush/drushrc.php /home/drupal/.drush/
-RUN chown -R drupal:drupal /home/drupal/.drush
+RUN mkdir -p /root/.drush
+COPY drushrc.php /root/.drush
 
-COPY root/home/drupal/.my.cnf /home/drupal/
-RUN chown -R drupal:drupal /home/drupal/.my.cnf
+COPY dotmy.cnf /root/.my.cnf
 
-USER drupal
-ENV PATH="/home/drupal/.composer/vendor/bin:${PATH}"
-ENV SIMPLETEST_BASE_URL="http://localhost:8080/"
+ENV PATH "/root/.composer/vendor/bin:${PATH}"
+ENV SIMPLETEST_BASE_URL http://localhost:8080/
 WORKDIR /projects
 
 EXPOSE 8080
-CMD ["supervisord", "-n", "-c", "/etc/supervisord.conf"]
+CMD ["supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]

README.md

@@ -4,6 +4,6 @@
 
 [Docker Hub](https://hub.docker.com/r/digdep/drupal-base/)
 
-This is a base image for running Drupal 8 in development. It does not come with Drupal itself, but it does come with a properly configured NGINX, PHP-FPM, Composer, and Drush, and the dependencies required for using it as an image on the CircleCI 2.0 platform.
+This is a base image for running Drupal 8 in development. It does not come with Drupal itself, but it does come with a properly configured NGINX (stable), PHP-FPM (7.1), Composer, Drush, Terminus, dependencies for Cypress, and dependencies for CircleCI 2.0.
 
 See `docker-compose.example.yml` for how to use.

root/home/drupal/.my.cnf renamed to dotmy.cnf

@@ -1,3 +1,5 @@
+user www-data;
+
 events {
   # The events block is required, but may be empty.
 }
@@ -102,7 +104,7 @@ http {
       # PHP 7 socket location.
       #fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
       #fastcgi_pass localhost:9000;
-      fastcgi_pass unix:/tmp/php-fpm.sock;
+      fastcgi_pass unix:/var/run/php7.1-fpm.sock;
     }
 
     # Fighting with Styles? This little gem is amazing.

root/home/drupal/.drush/drushrc.php renamed to drushrc.php

@@ -1,8 +1,13 @@
 [global]
+pid = /var/run/php7.1-fpm.pid
 error_log = /dev/stderr
 
 [www]
-listen = /tmp/php-fpm.sock
+user = www-data
+group = www-data
+listen = /var/run/php7.1-fpm.sock
+listen.owner = www-data
+listen.group = www-data
 
 pm = dynamic
 pm.max_children = 20
@@ -15,3 +20,9 @@ env[SMTPHOST] = $SMTPHOST
 
 ; Ensure worker stdout and stderr are sent to the main error log.
 catch_workers_output = yes
+
+; Don't duplicate errors via SAPI into NGINX's logs.
+php_flag[fastcgi.logging] = no
+
+; For Drupal.
+php_value[memory_limit] = 256M