RobLoach · RobLoach · Oct 25, 2016
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,8 @@ sudo: required
 services:
   - docker
 
-before_install:
-  - make
-
 script:
-  - make test
+  - make
 
 notifications:
   email: false
diff --git a/1.0/Dockerfile b/1.0/Dockerfile
diff --git a/1.0/alpine/Dockerfile b/1.0/alpine/Dockerfile
diff --git a/1.0/php5-alpine/Dockerfile b/1.0/php5-alpine/Dockerfile
diff --git a/1.0/php5/Dockerfile b/1.0/php5/Dockerfile
diff --git a/1.1/Dockerfile b/1.1/Dockerfile
diff --git a/1.1/alpine/Dockerfile b/1.1/alpine/Dockerfile
diff --git a/1.1/php5-alpine/Dockerfile b/1.1/php5-alpine/Dockerfile
diff --git a/1.1/php5/Dockerfile b/1.1/php5/Dockerfile
diff --git a/1.2/Dockerfile b/1.2/Dockerfile
@@ -1,11 +1,47 @@
-# Composer Docker Container
-FROM composer/composer:base
-MAINTAINER Rob Loach <robloach@gmail.com>
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+FROM php:7-cli
 
-ENV COMPOSER_VERSION 1.2.0
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y curl git subversion openssh-client openssl mercurial \
+ && rm -r /var/lib/apt/lists/*
 
-# Install Composer
-RUN php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer --version=${COMPOSER_VERSION} && rm -rf /tmp/composer-setup.php
+ENV TINI_VERSION v0.10.0
+RUN curl --silent --location --output /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini \
+ && curl --silent --location --output /sbin/tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc \
+ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
+ && gpg --verify /sbin/tini.asc \
+ && chmod +x /sbin/tini \
+ && rm /sbin/tini.asc
 
-# Display version information.
-RUN composer --version
+RUN echo "memory_limit=-1" > $PHP_INI_DIR/conf.d/memory-limit.ini \
+ && echo "date.timezone=${PHP_TIMEZONE:-UTC}" > $PHP_INI_DIR/conf.d/date_timezone.ini
+
+ENV COMPOSER_VERSION 1.2.1
+ENV COMPOSER_HOME /composer
+ENV PATH /composer/vendor/bin:$PATH
+ENV COMPOSER_ALLOW_SUPERUSER 1
+RUN curl --silent --location --output /tmp/composer-setup.php https://getcomposer.org/installer \
+ && curl --silent --location --output /tmp/composer-setup.sig https://composer.github.io/installer.sig \
+ && php -r " \
+    \$hash = hash('SHA384', file_get_contents('/tmp/composer-setup.php')); \
+    \$signature = trim(file_get_contents('/tmp/composer-setup.sig')); \
+    if (!hash_equals(\$signature, \$hash)) { \
+        unlink('/tmp/composer-setup.php'); \
+        echo 'Integrity check failed, installer is either corrupt or worse.' . PHP_EOL; \
+        exit(1); \
+    }" \
+ && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \
+ && rm /tmp/composer-setup.php \
+ && composer --ansi --version --no-interaction
+
+WORKDIR /app
+
+VOLUME /composer
+
+CMD ["--ansi", "--version"]
+
+ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/composer"]
diff --git a/1.2/alpine/Dockerfile b/1.2/alpine/Dockerfile
@@ -1,11 +1,37 @@
-# Composer Docker Container
-FROM composer/composer:base-alpine
-MAINTAINER Rob Loach <robloach@gmail.com>
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+FROM php:7-alpine
 
-ENV COMPOSER_VERSION 1.2.0
+RUN apk --no-cache add curl git subversion openssh openssl mercurial tini
 
-# Install Composer
-RUN php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer --version=${COMPOSER_VERSION} && rm -rf /tmp/composer-setup.php
+RUN echo "memory_limit=-1" > $PHP_INI_DIR/conf.d/memory-limit.ini \
+ && echo "date.timezone=${PHP_TIMEZONE:-UTC}" > $PHP_INI_DIR/conf.d/date_timezone.ini
 
-# Display version information.
-RUN composer --version
+ENV COMPOSER_VERSION 1.2.1
+ENV COMPOSER_HOME /composer
+ENV PATH /composer/vendor/bin:$PATH
+ENV COMPOSER_ALLOW_SUPERUSER 1
+RUN curl --silent --location --output /tmp/composer-setup.php https://getcomposer.org/installer \
+ && curl --silent --location --output /tmp/composer-setup.sig https://composer.github.io/installer.sig \
+ && php -r " \
+    \$hash = hash('SHA384', file_get_contents('/tmp/composer-setup.php')); \
+    \$signature = trim(file_get_contents('/tmp/composer-setup.sig')); \
+    if (!hash_equals(\$signature, \$hash)) { \
+        unlink('/tmp/composer-setup.php'); \
+        echo 'Integrity check failed, installer is either corrupt or worse.' . PHP_EOL; \
+        exit(1); \
+    }" \
+ && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \
+ && rm /tmp/composer-setup.php \
+ && composer --ansi --version --no-interaction
+
+WORKDIR /app
+
+VOLUME /composer
+
+CMD ["--ansi", "--version"]
+
+ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/composer"]
diff --git a/1.2/php5-alpine/Dockerfile b/1.2/php5-alpine/Dockerfile
diff --git a/1.2/php5/Dockerfile b/1.2/php5/Dockerfile
@@ -1,11 +1,47 @@
-# Composer Docker Container
-FROM composer/composer:base-php5
-MAINTAINER Rob Loach <robloach@gmail.com>
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+FROM php:5-cli
 
-ENV COMPOSER_VERSION 1.2.0
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y curl git subversion openssh-client openssl mercurial \
+ && rm -r /var/lib/apt/lists/*
 
-# Install Composer
-RUN php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer --version=${COMPOSER_VERSION} && rm -rf /tmp/composer-setup.php
+ENV TINI_VERSION v0.10.0
+RUN curl --silent --location --output /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini \
+ && curl --silent --location --output /sbin/tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc \
+ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
+ && gpg --verify /sbin/tini.asc \
+ && chmod +x /sbin/tini \
+ && rm /sbin/tini.asc
 
-# Display version information.
-RUN composer --version
+RUN echo "memory_limit=-1" > $PHP_INI_DIR/conf.d/memory-limit.ini \
+ && echo "date.timezone=${PHP_TIMEZONE:-UTC}" > $PHP_INI_DIR/conf.d/date_timezone.ini
+
+ENV COMPOSER_VERSION 1.2.1
+ENV COMPOSER_HOME /composer
+ENV PATH /composer/vendor/bin:$PATH
+ENV COMPOSER_ALLOW_SUPERUSER 1
+RUN curl --silent --location --output /tmp/composer-setup.php https://getcomposer.org/installer \
+ && curl --silent --location --output /tmp/composer-setup.sig https://composer.github.io/installer.sig \
+ && php -r " \
+    \$hash = hash('SHA384', file_get_contents('/tmp/composer-setup.php')); \
+    \$signature = trim(file_get_contents('/tmp/composer-setup.sig')); \
+    if (!hash_equals(\$signature, \$hash)) { \
+        unlink('/tmp/composer-setup.php'); \
+        echo 'Integrity check failed, installer is either corrupt or worse.' . PHP_EOL; \
+        exit(1); \
+    }" \
+ && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \
+ && rm /tmp/composer-setup.php \
+ && composer --ansi --version --no-interaction
+
+WORKDIR /app
+
+VOLUME /composer
+
+CMD ["--ansi", "--version"]
+
+ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/composer"]
diff --git a/1.2/php5/alpine/Dockerfile b/1.2/php5/alpine/Dockerfile
@@ -0,0 +1,37 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+FROM php:5-alpine
+
+RUN apk --no-cache add curl git subversion openssh openssl mercurial tini
+
+RUN echo "memory_limit=-1" > $PHP_INI_DIR/conf.d/memory-limit.ini \
+ && echo "date.timezone=${PHP_TIMEZONE:-UTC}" > $PHP_INI_DIR/conf.d/date_timezone.ini
+
+ENV COMPOSER_VERSION 1.2.1
+ENV COMPOSER_HOME /composer
+ENV PATH /composer/vendor/bin:$PATH
+ENV COMPOSER_ALLOW_SUPERUSER 1
+RUN curl --silent --location --output /tmp/composer-setup.php https://getcomposer.org/installer \
+ && curl --silent --location --output /tmp/composer-setup.sig https://composer.github.io/installer.sig \
+ && php -r " \
+    \$hash = hash('SHA384', file_get_contents('/tmp/composer-setup.php')); \
+    \$signature = trim(file_get_contents('/tmp/composer-setup.sig')); \
+    if (!hash_equals(\$signature, \$hash)) { \
+        unlink('/tmp/composer-setup.php'); \
+        echo 'Integrity check failed, installer is either corrupt or worse.' . PHP_EOL; \
+        exit(1); \
+    }" \
+ && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} \
+ && rm /tmp/composer-setup.php \
+ && composer --ansi --version --no-interaction
+
+WORKDIR /app
+
+VOLUME /composer
+
+CMD ["--ansi", "--version"]
+
+ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/composer"]
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
diff --git a/Dockerfile-php5-alpine.template b/Dockerfile-php5-alpine.template
diff --git a/Dockerfile-php5.template b/Dockerfile-php5.template
diff --git a/Dockerfile.template b/Dockerfile.template
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) Composer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.