Rebase onto outrigger/keel

README.md

@@ -4,16 +4,19 @@
 
 ## Supported tags and respective `Dockerfile` links
 
--	[`php55` (*php55/Dockerfile*)](https://github.com/phase2/docker-build/blob/master/php55/Dockerfile) [![](https://images.microbadger.com/badges/image/outrigger/build:php55.svg)](https://microbadger.com/images/outrigger/build:php55 "Get your own image badge on microbadger.com")
--	[`php56` (*php56/Dockerfile*)](https://github.com/phase2/docker-build/blob/master/php56/Dockerfile) [![](https://images.microbadger.com/badges/image/outrigger/build:php56.svg)](https://microbadger.com/images/outrigger/build:php56 "Get your own image badge on microbadger.com")
--	[`php70` (*php70/Dockerfile*)](https://github.com/phase2/docker-build/blob/master/php70/Dockerfile) [![](https://images.microbadger.com/badges/image/outrigger/build:php70.svg)](https://microbadger.com/images/outrigger/build:php70 "Get your own image badge on microbadger.com")
--	[`php71` (*php71/Dockerfile*)](https://github.com/phase2/docker-build/blob/master/php71/Dockerfile) [![](https://images.microbadger.com/badges/image/outrigger/build:php71.svg)](https://microbadger.com/images/outrigger/build:php71 "Get your own image badge on microbadger.com")
+- [`php55` (*php55/Dockerfile*)](https://github.com/phase2/docker-build/blob/master/php55/Dockerfile) [![](https://images.microbadger.com/badges/image/outrigger/build:php55.svg)](https://microbadger.com/images/outrigger/build:php55 "Get your own image badge on microbadger.com")
+- [`php56` (*php56/Dockerfile*)](https://github.com/phase2/docker-build/blob/master/php56/Dockerfile) [![](https://images.microbadger.com/badges/image/outrigger/build:php56.svg)](https://microbadger.com/images/outrigger/build:php56 "Get your own image badge on microbadger.com")
+- [`php70` (*php70/Dockerfile*)](https://github.com/phase2/docker-build/blob/master/php70/Dockerfile) [![](https://images.microbadger.com/badges/image/outrigger/build:php70.svg)](https://microbadger.com/images/outrigger/build:php70 "Get your own image badge on microbadger.com")
+- [`php71` (*php71/Dockerfile*)](https://github.com/phase2/docker-build/blob/master/php71/Dockerfile) [![](https://images.microbadger.com/badges/image/outrigger/build:php71.svg)](https://microbadger.com/images/outrigger/build:php71 "Get your own image badge on microbadger.com")
 
 This image provides the many development tools necessary to build applications
 the Outrigger way, bundled with a wide array of tools useful for development and
 troubleshooting via the command-line interface. While it is possible to directly
 connect to the web containers, this is the preferred way to perform "server work".
 
+The build images derive from [outrigger/keel](https://github.com/phase2/docker-keel),
+our CLI workshop base image.
+
 For more documentation on how Outrigger images are constructed and how to work
 with them, please [see the documentation](http://docs.outrigger.sh).
 
@@ -48,9 +51,9 @@ file is written there. For example `/data/PROJECT/ENV/bash:/root/bash`
 
 ## Environment Variables
 
-Outrigger images use Environment Variables and [confd](https://github.com/kelseyhightower/confd) to templatize a number 
-of Docker environment configurations. These templates are processed on startup with environment variables passed in 
-via the docker run command-line or via your `docker-compose.yml` manifest file. Here are the "tunable" configurations 
+Outrigger images use Environment Variables and [confd](https://github.com/kelseyhightower/confd) to templatize a number
+of Docker environment configurations. These templates are processed on startup with environment variables passed in
+via the docker run command-line or via your `docker-compose.yml` manifest file. Here are the "tunable" configurations
 offered by this image.
 
 * `NODE_VERSION`: [`4`|`6`|`8`] Defaults to 4. Selects the major version of Node

php55/Dockerfile

@@ -1,26 +1,27 @@
-FROM centos:7
+FROM outrigger/keel:1.0
+
+# Add Labels for differences from outrigger/keel.
+# @see http://label-schema.org/rc1/
+# CentOS adds a name label but it is misleading in our instance.
+LABEL \
+  name="Outrigger Build (PHP)" \
+  org.label-schema.name="Outrigger Build (PHP)" \
+  org.label-schema.description="A CentOS-based image that facilitates interconnected build and operational tasks for PHP." \
+  org.label-schema.vcs-url="https://github.com/phase2/docker-build" \
+  org.label-schema.docker.cmd="docker run -it --rm outrigger/build:php55 bash" \
+  org.label-schema.docker.cmd.help="docker run -it --rm outrigger/build:php55"
 
 # Install base packages.
-RUN yum -y install epel-release centos-release-scl yum-plugin-ovl deltarpm && \
-    yum -y update && \
-    yum -y install sudo ssh curl less vim-minimal dnsutils openssl
-
-# Download confd.
-ENV CONFD_VERSION 0.11.0
-RUN curl -L "https://github.com/kelseyhightower/confd/releases/download/v$CONFD_VERSION/confd-$CONFD_VERSION-linux-amd64" > /usr/bin/confd && \
-    chmod +x /usr/bin/confd
-ENV CONFD_OPTS '--backend=env --onetime'
+RUN yum -y install centos-release-scl \
+    && yum -y update
 
 RUN yum -y install \
       https://www.softwarecollections.org/en/scls/remi/php55more/epel-7-x86_64/download/remi-php55more-epel-7-x86_64.noarch.rpm && \
     yum -y update
 
 RUN yum-config-manager --enable rhel-server-rhscl-7-rpms
 
-# Add the IUS repository. This is needed for git2.
-RUN curl -L "https://centos7.iuscommunity.org/ius-release.rpm" > /usr/local/ius-release.rpm && \
-    rpm -Uvh /usr/local/ius-release.rpm
-
+# Install language runtimes and additional tools.
 RUN yum -y install \
     # Install PHP
     php55 \
@@ -43,25 +44,15 @@ RUN yum -y install \
     ruby193-rubygems \
     ruby193-ruby-devel \
     # Install Miscellaneous Tools
-    bzip2 \
     gcc-c++ \
-    git2u-all \
     httpd-tools \
-    jq \
-    make \
     mariadb \
     nmap-ncat \
-    patch \
-    pv \
     postgresql \
-    rsync \
-    sendmail \
-    unzip \
-    # Necessary for drush
-    which \
     # Necessary library for phantomjs per https://github.com/ariya/phantomjs/issues/10904
     fontconfig \
-    && yum clean all
+    && yum clean all \
+    && rm -rf /var/cache/yum
 
 # Ensure php55 and ruby193 binaries are in path
 ENV PATH /root/.composer/vendor/bin:/opt/rh/ruby193/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
@@ -77,10 +68,6 @@ ENV PKG_CONFIG_PATH /opt/rh/ruby193/root/usr/lib64/pkgconfig
 # Ensure $HOME is set
 ENV HOME /root
 
-# Configure Git
-# https://git-scm.com/docs/git-config#git-config-corepreloadIndex
-RUN git config --global core.preloadindex true
-
 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/bin/composer
 # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser

php56/Dockerfile

@@ -1,15 +1,19 @@
-FROM centos:7
+FROM outrigger/keel:1.0
+
+# Add Labels for differences from outrigger/keel.
+# @see http://label-schema.org/rc1/
+# CentOS adds a name label but it is misleading in our instance.
+LABEL \
+  name="Outrigger Build (PHP)" \
+  org.label-schema.name="Outrigger Build (PHP)" \
+  org.label-schema.description="A CentOS-based image that facilitates interconnected build and operational tasks for PHP." \
+  org.label-schema.vcs-url="https://github.com/phase2/docker-build" \
+  org.label-schema.docker.cmd="docker run -it --rm outrigger/build:php56 bash" \
+  org.label-schema.docker.cmd.help="docker run -it --rm outrigger/build:php56"
 
 # Install base packages.
-RUN yum -y install epel-release yum-plugin-ovl deltarpm && \
-    yum -y update && \
-    yum -y install sudo ssh curl less vim-minimal dnsutils openssl
-
-# Download confd.
-ENV CONFD_VERSION 0.11.0
-RUN curl -L "https://github.com/kelseyhightower/confd/releases/download/v$CONFD_VERSION/confd-$CONFD_VERSION-linux-amd64" > /usr/bin/confd && \
-    chmod +x /usr/bin/confd
-ENV CONFD_OPTS '--backend=env --onetime'
+RUN yum -y install epel-release yum-plugin-ovl deltarpm \
+    && yum -y update
 
 RUN yum -y install \
       centos-release-scl-rh \
@@ -18,10 +22,7 @@ RUN yum -y install \
       https://www.softwarecollections.org/en/scls/rhscl/v8314/epel-7-x86_64/download/rhscl-v8314-epel-7-x86_64.noarch.rpm && \
     yum -y update
 
-# Add the IUS repository. This is needed for git2.
-RUN curl -L "https://centos7.iuscommunity.org/ius-release.rpm" > /usr/local/ius-release.rpm && \
-    rpm -Uvh /usr/local/ius-release.rpm
-
+# Install language runtimes and additional tools.
 RUN yum -y install \
     # Install PHP
     rh-php56 \
@@ -42,25 +43,15 @@ RUN yum -y install \
     ruby193-rubygems \
     ruby193-ruby-devel \
     # Install Miscellaneous Tools
-    bzip2 \
     gcc-c++ \
-    git2u-all \
     httpd-tools \
-    jq \
-    make \
     mariadb \
     nmap-ncat \
-    patch \
     postgresql \
-    pv \
-    rsync \
-    sendmail \
-    unzip \
-    # Necessary for drush
-    which \
     # Necessary library for phantomjs per https://github.com/ariya/phantomjs/issues/10904
     fontconfig \
-    && yum clean all
+    && yum clean all \
+    && rm -rf /var/cache/yum
 
 # Ensure ruby193 binaries are in path
 ENV PATH /root/.composer/vendor/bin:/opt/rh/ruby193/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
@@ -87,10 +78,6 @@ ENV PKG_CONFIG_PATH /opt/rh/ruby193/root/usr/lib64/pkgconfig
 # Ensure $HOME is set
 ENV HOME /root
 
-# Configure Git
-# https://git-scm.com/docs/git-config#git-config-corepreloadIndex
-RUN git config --global core.preloadindex true
-
 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/bin/composer
 # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser