Merge pull request #61 from james-nesbitt/fixsomebuilds

fixed a number of command based image builds

Author: james-nesbitt

drupalconsole/Dockerfile

@@ -3,33 +3,27 @@ MAINTAINER james.nesbitt@wunderkraut.com
 
 ### DRUPALCONSOLE ----------------------------------------------------------
 
-# Install MariaDB
-ADD etc/yum.repos.d/mariadb.repo etc/yum.repos.d/mariadb.repo
-RUN /usr/bin/yum --assumeyes --verbose install MariaDB-client
-
 # Prepare to use the remi repo for PHP: our .repo file has certain repos enabled=1
 ADD root/remi-release-7.rpm /root/remi-release-7.rpm
 RUN /usr/bin/rpm -Uvh /root/remi-release-7.rpm
 ADD etc/yum.repos.d/remi.repo /etc/yum.repos.d/remi.repo
 ADD etc/yum.repos.d/remi-php70.repo /etc/yum.repos.d/remi-php70.repo
 
-# Install php-fpm
 RUN /usr/bin/yum install --assumeyes --verbose \
-    php-cli php-pdo php-mysql php-pgsql php-ldap php-gd php-mbstring php-mcrypt php-xml \
-    php-opcache php-pecl-uploadprogress
-
-# Install some tools that are used for composer and user handling
-RUN /usr/bin/yum --assumeyes --verbose install openssl tar git
+    php-cli php-opcache php-pdo php-mysql php-pgsql php-ldap \
+    php-gd php-mbstring php-mcrypt php-xml php-soap php-json \
+    php-pecl-uploadprogress php-pecl-apcu php-pecl-geoip
 
 # Add some php extension configuraiton overrides
 ADD etc/php.d/01-defaultdatezone.ini /etc/php.d/01-defaultdatezone.ini
 ADD etc/php.d/40-apcu.ini /etc/php.d/40-apcu.ini
 
-# Install blackfire
-ADD etc/yum.repos.d/blackfire.repo /etc/yum.repos.d/blackfire.repo
-RUN /usr/bin/yum install -y install pygpgme blackfire-php
-# Add some php extension configuraiton overrides
-ADD etc/php.d/zz-blackfire.ini /etc/php.d/zz-blackfire.ini
+# Install MariaDB
+ADD etc/yum.repos.d/mariadb.repo etc/yum.repos.d/mariadb.repo
+RUN /usr/bin/yum --assumeyes --verbose install MariaDB-client
+
+# Install some tools that are used for composer and user handling
+RUN /usr/bin/yum --assumeyes --verbose install openssl tar git
 
 # Install composer which will be used to install drush
 RUN /usr/bin/curl -sS https://getcomposer.org/installer | php -- --filename=composer --install-dir=/usr/local/bin
@@ -47,30 +41,27 @@ RUN /usr/bin/mkdir /app/.drush && \
     /usr/bin/mkdir /app/.ssh && \
     /usr/bin/chown -R app:app /app/.ssh
 
-# Everything else is run as the platform user
+# Everything else is run as the application user
 USER app
 
-# Install nodejs and npm, which gets used for lots of stuff with SASS/SCSS
-#RUN /usr/bin/yum install --assumeyes --verbose nodejs npm
-#RUN /usr/bin/npm install gulp -g
-
 # Make sure that the composer items are in path
 ENV PATH /app/bin:/app/.composer/vendor/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
-# Install Drupal console
-RUN /usr/local/bin/composer global require drupal/console:dev-master
+# set up some env variables to make using easier.
+ENV TERM="xterm"
 
-# Install DRUSH, which is can be run by drush
-RUN /usr/local/bin/composer global require drush/drush:dev-master drush/config-extra
+# Install nodejs and npm, which gets used for lots of stuff with SASS/SCSS
+#RUN /usr/bin/yum install --assumeyes --verbose nodejs npm
+#RUN /usr/bin/npm install gulp -g
 
-# Get some additional suggested packages
-RUN /usr/local/bin/composer global require pear/Console_Color2
+# Install DRUSH, which is a requiremnt for platform
+RUN /usr/local/bin/composer global require drush/drush:dev-master drush/config-extra
 
-# Some usefull env variables
-ENV TERM=xterm
+# Install Drupal Console
+RUN /usr/local/bin/composer global require drupal/console
 
 WORKDIR "/app/www/active"
-ENTRYPOINT ["/app/.composer/vendor/bin/console", "--ansi", "--drupal=/app/www/active"]
-CMD "--shell"
+ENTRYPOINT ["/app/.composer/vendor/bin/console", "--ansi"]
+CMD ["--shell"]
 
 ### /DRUPALCONSOLE ---------------------------------------------------------------=

drupalconsole/etc/php.d/zz-blackfire.ini

@@ -9,30 +9,46 @@ RUN /usr/bin/rpm -Uvh /root/remi-release-7.rpm
 ADD etc/yum.repos.d/remi.repo /etc/yum.repos.d/remi.repo
 ADD etc/yum.repos.d/remi-php70.repo /etc/yum.repos.d/remi-php70.repo
 
-# Install php-fpm
 RUN /usr/bin/yum install --assumeyes --verbose \
-    php-cli php-pdo php-mysql php-pgsql php-ldap php-gd php-mbstring php-mcrypt php-xml \
-    php-opcache php-pecl-uploadprogress
+    php-cli php-opcache php-pdo php-mysql php-pgsql php-ldap \
+    php-gd php-mbstring php-mcrypt php-xml php-soap php-json \
+    php-pecl-uploadprogress php-pecl-apcu php-pecl-geoip
+
+# Add some php extension configuraiton overrides
+ADD etc/php.d/01-defaultdatezone.ini /etc/php.d/01-defaultdatezone.ini
+ADD etc/php.d/40-apcu.ini /etc/php.d/40-apcu.ini
 
 # Install MariaDB
 ADD etc/yum.repos.d/mariadb.repo etc/yum.repos.d/mariadb.repo
 RUN /usr/bin/yum --assumeyes --verbose install MariaDB-client
 
+# Install some tools that are used for composer and user handling
+RUN /usr/bin/yum --assumeyes --verbose install openssl tar git
+
 # Install composer which will be used to install drush
 RUN /usr/bin/curl -sS https://getcomposer.org/installer | php -- --filename=composer --install-dir=/usr/local/bin
 
-# Install Drush
-RUN /usr/local/bin/composer global require drush/drush:dev-master
+# make sure that the nginx user is created, and has access to app user files
+# nginx:x:999:999:Nginx web server:/var/lib/nginx:/sbin/nologin
+RUN /usr/sbin/adduser --home-dir /var/lib/nginx --uid 999 --user-group --shell /bin/nologin --password "`openssl rand -base64 32 | openssl passwd -1 -stdin`" --comment "Nginx web server" nginx && \
+    /usr/bin/gpasswd -a nginx app
 
-# add drush settings & aliases
-RUN /usr/bin/mkdir /etc/drush
-RUN /usr/bin/mkdir /app/.drush/ && \
-    /usr/bin/chown -R app:app /app/.drush
+# Set up some folders for the tools that we may use
+RUN /usr/bin/mkdir /app/.drush && \
+    /usr/bin/chown -R app:app /app/.drush && \
+    /usr/bin/mkdir /app/.composer && \
+    /usr/bin/chown -R app:app /app/.composer && \
+    /usr/bin/mkdir /app/.ssh && \
+    /usr/bin/chown -R app:app /app/.ssh
 
+# Everything else is run as the application user
 USER app
 
-# set up some env variables to make using easier.
-ENV TERM="xterm"
+# Make sure that the composer items are in path
+ENV PATH /app/bin:/app/.composer/vendor/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+# Install DRUSH
+RUN /usr/local/bin/composer global require drush/drush:dev-master drush/config-extra
 
 ENTRYPOINT ["/app/.composer/vendor/bin/drush"]
 CMD ["status"]

drupalconsole/etc/yum.repos.d/blackfire.repo

@@ -0,0 +1,2 @@
+[date]
+date.timezone = "UTC"

drush8/Dockerfile

@@ -0,0 +1,73 @@
+; Enable APCu extension module
+extension = apcu.so
+
+;	This can be set to 0 to disable APCu
+apc.enabled=1
+
+;	Setting this enables APCu for the CLI version of PHP
+;	(Mostly for testing and debugging).
+;apc.enable_cli=0
+apc.enable_cli=1
+
+;	Sets the path to text files containing caches to load from disk upon
+;	initialization of APCu. preload_path should be a directory where each
+;	file follows $key.data where $key should be used as the entry name
+;	and the contents of the file contains serialized data to use as the value
+;	of the entry.
+;apc.preload_path=
+
+;	The size of each shared memory segment, with M/G suffixe
+;apc.shm_size=32M
+
+;	The number of seconds a cache entry is allowed to idle in a slot in case
+;	this cache entry slot is needed by another entry.
+;apc.ttl=0
+
+;	The number of seconds that a cache entry may remain on the
+;	garbage-collection list.
+;apc.gc_ttl=3600
+
+;	If you begin to get low on resources, an expunge of the cache
+;	is performed if it is less than half full. This is not always
+;	a suitable way of determining if an expunge of the cache
+;	should be per apc.smart allows you to set a runtime configuration
+;	value which	is used to determine if an expunge should be run
+;	if (available_size < apc.smart * requested_size)
+;apc.smart=0
+
+;	A "hint" about the number variables expected in the cache.
+;	Set to zero or omit if you are not sure;
+;apc.entries_hint=4096
+
+;	The mktemp-style file_mask to pass to the mmap module 
+apc.mmap_file_mask=/tmp/apc.XXXXXX
+
+;	On very busy servers whenever you start the server or
+;	modify files you can create a race of many processes
+;	all trying to cache the same data at the same time.
+;	By default, APCu attempts to prevent "slamming" of a key.
+;	A key is considered "slammed" if it was the last key set,
+;	and a context other than the current one set it ( ie. it
+;	was set by another process or thread )
+;apc.slam_defense=1
+
+;	Defines which serializer should be used
+;	Default is the standard PHP serializer.
+;apc.serializer='default'
+
+;	use the SAPI request start time for TTL
+;apc.use_request_time=1
+
+;	Enables APCu handling of signals, such as SIGSEGV, that write core files
+;	when signaled. APCu will attempt to unmap the shared memory segment in
+;	order to exclude it from the core file
+;apc.coredump_unmap=0
+
+
+;	RFC1867 File Upload Progress hook handler
+;apc.rfc1867=0
+;apc.rfc1867_prefix =upload_
+;apc.rfc1867_name=APC_UPLOAD_PROGRESS
+;apc.rfc1867_freq=0
+;apc.rfc1867_ttl=3600
+

drush8/etc/php.d/01-defaultdatezone.ini

@@ -12,7 +12,7 @@ ADD etc/yum.repos.d/remi-php70.repo /etc/yum.repos.d/remi-php70.repo
 
 # Install php-fpm
 RUN /usr/bin/yum install --assumeyes --verbose \
-    php-fpm php-opcache php-fpm php-pdo php-mysql php-pgsql php-ldap \
+    php-fpm php-opcache php-pdo php-mysql php-pgsql php-ldap \
     php-gd php-mbstring php-mcrypt php-xml php-soap php-json \
     php-pecl-uploadprogress php-pecl-apcu php-pecl-geoip
 

drush8/etc/php.d/40-apcu.ini

@@ -3,28 +3,53 @@ MAINTAINER  james.nesbitt@wunderkraut.com
 
 ### PLATFORMSH ----------------------------------------------------------------
 
-# Install some base tools
-RUN /usr/bin/yum --assumeyes --verbose install tar gunzip git
+# Prepare to use the remi repo for PHP: our .repo file has certain repos enabled=1
+ADD root/remi-release-7.rpm /root/remi-release-7.rpm
+RUN /usr/bin/rpm -Uvh /root/remi-release-7.rpm
+ADD etc/yum.repos.d/remi.repo /etc/yum.repos.d/remi.repo
+ADD etc/yum.repos.d/remi-php70.repo /etc/yum.repos.d/remi-php70.repo
 
-# Install PHP
 RUN /usr/bin/yum install --assumeyes --verbose \
-    php-cli php-opcache php-pecl-apc php-pdo php-mysql php-pgsql php-pecl-mongo \
-    php-ldap php-sqlite php-pecl-memcache php-pecl-memcached php-gd php-mbstring \
-    php-mcrypt php-xml php-pecl-yaml php-twig php-twig-ctwig php-pecl-uploadprogress
+    php-cli php-opcache php-pdo php-mysql php-pgsql php-ldap \
+    php-gd php-mbstring php-mcrypt php-xml php-soap php-json \
+    php-pecl-uploadprogress php-pecl-apcu php-pecl-geoip
 
-# Install Composer
+# Add some php extension configuraiton overrides
+ADD etc/php.d/01-defaultdatezone.ini /etc/php.d/01-defaultdatezone.ini
+ADD etc/php.d/40-apcu.ini /etc/php.d/40-apcu.ini
+
+# Install MariaDB
+ADD etc/yum.repos.d/mariadb.repo etc/yum.repos.d/mariadb.repo
+RUN /usr/bin/yum --assumeyes --verbose install MariaDB-client
+
+# Install some tools that are used for composer and user handling
+RUN /usr/bin/yum --assumeyes --verbose install openssl tar git
+
+# Install composer which will be used to install drush
 RUN /usr/bin/curl -sS https://getcomposer.org/installer | php -- --filename=composer --install-dir=/usr/local/bin
 
-# Create the composer build path
-RUN /usr/bin/mkdir /composer && \
-    /usr/bin/chown app:app /composer
+# make sure that the nginx user is created, and has access to app user files
+# nginx:x:999:999:Nginx web server:/var/lib/nginx:/sbin/nologin
+RUN /usr/sbin/adduser --home-dir /var/lib/nginx --uid 999 --user-group --shell /bin/nologin --password "`openssl rand -base64 32 | openssl passwd -1 -stdin`" --comment "Nginx web server" nginx && \
+    /usr/bin/gpasswd -a nginx app
 
-# Everything else is run as the platform user
+# Set up some folders for the tools that we may use
+RUN /usr/bin/mkdir /app/.drush && \
+    /usr/bin/chown -R app:app /app/.drush && \
+    /usr/bin/mkdir /app/.composer && \
+    /usr/bin/chown -R app:app /app/.composer && \
+    /usr/bin/mkdir /app/.ssh && \
+    /usr/bin/chown -R app:app /app/.ssh
+
+# Everything else is run as the application user
 USER app
 
-# Add composer paths and app/bin to path
+# Make sure that the composer items are in path
 ENV PATH /app/bin:/app/.composer/vendor/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
+# set up some env variables to make using easier.
+ENV TERM="xterm"
+
 # Install DRUSH, which is a requiremnt for platform
 RUN /usr/local/bin/composer global require drush/drush:dev-master drush/config-extra
 ENV PLATFORMSH_CLI_DRUSH=/app/.composer/vendor/bin/drush
@@ -39,4 +64,4 @@ ENV PLATFORMSH_CLI_DISABLE_CACHE=0
 ENTRYPOINT ["/app/.composer/vendor/bin/platform"]
 CMD ["--shell"]
 
-### /PLATFORMSH ---------------------------------------------------------------
+### /PLATFORMSH ---------------------------------------------------------------

php7fpm/Dockerfile

@@ -0,0 +1,2 @@
+[date]
+date.timezone = "UTC"