Merge pull request laradock#1434 from bestlong/sort-up

Sort up

.gitlab-ci.yml

@@ -0,0 +1,62 @@
+# image: docker:latest
+# services:
+#   - docker:dind
+image: jonaskello/docker-and-compose:1.12.1-1.8.0
+services:
+  - docker:1.12.1-dind
+
+before_script:
+  - docker info
+  - docker-compose version
+  - cp env-example .env
+  - sed -i -- "s/=false/=true/g" .env
+  - cat .env
+  - env | sort
+
+build:56:php-fpm:
+  variables:
+    PHP_VERSION: "56"
+  script:
+    - docker-compose build php-fpm
+
+build:70:php-fpm:
+  variables:
+    PHP_VERSION: "70"
+  script:
+    - docker-compose build php-fpm
+
+build:71:php-fpm:
+  variables:
+    PHP_VERSION: "71"
+  script:
+    - docker-compose build php-fpm
+
+build:72:php-fpm:
+  variables:
+    PHP_VERSION: "72"
+  script:
+    - docker-compose build php-fpm
+
+build:56:workspace:
+  variables:
+    PHP_VERSION: "56"
+  script:
+    - docker-compose build workspace
+
+build:70:workspace:
+  variables:
+    PHP_VERSION: "70"
+  script:
+    - docker-compose build workspace
+
+build:71:workspace:
+  variables:
+    PHP_VERSION: "71"
+  script:
+    - docker-compose build workspace
+
+build:72:workspace:
+  variables:
+    PHP_VERSION: "72"
+  script:
+    - docker-compose build workspace

adminer/Dockerfile

@@ -3,7 +3,7 @@ FROM adminer:4.3.0
 # Version 4.3.1 contains PostgreSQL login errors. See docs.
 # See https://sourceforge.net/p/adminer/bugs-and-features/548/
 
-MAINTAINER Patrick Artounian <[email protected]>
+LABEL maintainer="Patrick Artounian <[email protected]>"
 
 # Add volume for sessions to allow session persistence
 VOLUME /sessions

aerospike/Dockerfile

@@ -1,7 +1,7 @@
 FROM aerospike:latest
 
-MAINTAINER Luciano Jr <[email protected]>
+LABEL maintainer="Luciano Jr <[email protected]>"
 
 RUN rm /etc/aerospike/aerospike.conf
 
-ADD aerospike.conf /etc/aerospike/aerospike.conf
+ADD aerospike.conf /etc/aerospike/aerospike.conf

apache2/Dockerfile

@@ -1,6 +1,6 @@
 FROM webdevops/apache:ubuntu-16.04
 
-MAINTAINER Eric Pfeiffer <[email protected]>
+LABEL maintainer="Eric Pfeiffer <[email protected]>"
 
 ARG PHP_UPSTREAM_CONTAINER=php-fpm
 ARG PHP_UPSTREAM_PORT=9000

aws/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:slim
 
-MAINTAINER [email protected]
+LABEL maintainer="[email protected]"
 
 RUN pip install --upgrade --no-cache-dir awsebcli
 RUN apt-get -yqq update && apt-get -yqq install git-all

beanstalkd-console/Dockerfile

@@ -1,6 +1,6 @@
 FROM php:latest
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 RUN apt-get update && apt-get install -y curl
 

beanstalkd/Dockerfile

@@ -1,6 +1,6 @@
 FROM phusion/baseimage:latest
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
@@ -13,4 +13,4 @@ VOLUME /var/lib/beanstalkd/data
 
 EXPOSE 11300
 
-CMD ["/usr/bin/beanstalkd"]
+CMD ["/usr/bin/beanstalkd"]

caddy/Dockerfile

@@ -1,7 +1,6 @@
 FROM zuohuadong/caddy:alpine
 
-
-MAINTAINER Huadong Zuo <[email protected]>
+LABEL maintainer="Huadong Zuo <[email protected]>"
 
 ARG plugins="cors"
 

certbot/Dockerfile

@@ -1,6 +1,6 @@
 FROM phusion/baseimage:latest
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 COPY run-certbot.sh /root/certbot/run-certbot.sh
 

haproxy/Dockerfile

@@ -1,5 +1,5 @@
 FROM dockercloud/haproxy:latest
 
-MAINTAINER ZeroC0D3 Team<[email protected]>
+LABEL maintainer="ZeroC0D3 Team<[email protected]>"
 
 EXPOSE 80

hhvm/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:14.04
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449
 

maildev/Dockerfile

@@ -1,5 +1,5 @@
 FROM djfarrelly/maildev
 
-MAINTAINER Maxime Hélias <[email protected]>
+LABEL maintainer="Maxime Hélias <[email protected]>"
 
 EXPOSE 80 25

mailhog/Dockerfile

@@ -1,6 +1,6 @@
 FROM mailhog/mailhog
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 CMD ["Mailhog"]
 

mariadb/Dockerfile

@@ -1,6 +1,6 @@
 FROM mariadb:latest
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 ADD my.cnf /etc/mysql/conf.d/my.cnf
 

mssql/Dockerfile

@@ -1,6 +1,6 @@
 FROM microsoft/mssql-server-linux
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 # Create config directory
 # an set it as WORKDIR

php-fpm/Dockerfile-56

@@ -14,7 +14,7 @@
 
 FROM laradock/php-fpm:2.0-56
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 #
 #--------------------------------------------------------------------------

php-fpm/Dockerfile-70

@@ -14,7 +14,7 @@
 
 FROM laradock/php-fpm:2.0-70
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 #
 #--------------------------------------------------------------------------

php-fpm/Dockerfile-71

@@ -14,7 +14,7 @@
 
 FROM laradock/php-fpm:2.0-71
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 #
 #--------------------------------------------------------------------------

php-fpm/Dockerfile-72

@@ -14,7 +14,7 @@
 
 FROM laradock/php-fpm:2.0-72
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 #
 #--------------------------------------------------------------------------

workspace/Dockerfile-56

@@ -14,7 +14,7 @@
 
 FROM laradock/workspace:2.0-56
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 # Remove Faillog and Lastlog to reduce the size of the final image.
 RUN rm /var/log/lastlog /var/log/faillog
@@ -233,12 +233,10 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 # AMQP:
 #####################################
 
-# Check if Mongo needs to be installed
 ARG INSTALL_AMQP=false
 ENV INSTALL_AMQP ${INSTALL_AMQP}
 RUN if [ ${INSTALL_AMQP} = true ]; then \
     apt-get install librabbitmq-dev -y && \
-    # Install the mongodb extension
     pecl -q install amqp && \
     echo "extension=amqp.so" >> /etc/php/5.6/mods-available/amqp.ini && \
     ln -s /etc/php/5.6/mods-available/amqp.ini /etc/php/5.6/cli/conf.d/30-amqp.ini \

workspace/Dockerfile-70

@@ -14,7 +14,7 @@
 
 FROM laradock/workspace:2.0-70
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 # Remove Faillog and Lastlog to reduce the size of the final image.
 RUN rm /var/log/lastlog /var/log/faillog
@@ -229,12 +229,10 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 # AMQP:
 #####################################
 
-# Check if Mongo needs to be installed
 ARG INSTALL_AMQP=false
 ENV INSTALL_AMQP ${INSTALL_AMQP}
 RUN if [ ${INSTALL_AMQP} = true ]; then \
     apt-get install librabbitmq-dev -y && \
-    # Install the mongodb extension
     pecl -q install amqp && \
     echo "extension=amqp.so" >> /etc/php/7.0/mods-available/amqp.ini && \
     ln -s /etc/php/7.0/mods-available/amqp.ini /etc/php/7.0/cli/conf.d/30-amqp.ini \

workspace/Dockerfile-71

@@ -14,7 +14,7 @@
 
 FROM laradock/workspace:2.0-71
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 # Remove Faillog and Lastlog to reduce the size of the final image.
 RUN rm /var/log/lastlog /var/log/faillog
@@ -225,12 +225,10 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 # AMQP:
 #####################################
 
-# Check if Mongo needs to be installed
 ARG INSTALL_AMQP=false
 ENV INSTALL_AMQP ${INSTALL_AMQP}
 RUN if [ ${INSTALL_AMQP} = true ]; then \
     apt-get install librabbitmq-dev -y && \
-    # Install the mongodb extension
     pecl -q install amqp && \
     echo "extension=amqp.so" >> /etc/php/7.1/mods-available/amqp.ini && \
     ln -s /etc/php/7.1/mods-available/amqp.ini /etc/php/7.1/cli/conf.d/30-amqp.ini \

workspace/Dockerfile-72

@@ -14,7 +14,7 @@
 
 FROM laradock/workspace:2.0-72
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
 # Remove Faillog and Lastlog to reduce the size of the final image.
 RUN rm /var/log/lastlog /var/log/faillog
@@ -225,12 +225,10 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
 # AMQP:
 #####################################
 
-# Check if Mongo needs to be installed
 ARG INSTALL_AMQP=false
 ENV INSTALL_AMQP ${INSTALL_AMQP}
 RUN if [ ${INSTALL_AMQP} = true ]; then \
     apt-get install librabbitmq-dev -y && \
-    # Install the mongodb extension
     pecl -q install amqp && \
     echo "extension=amqp.so" >> /etc/php/7.2/mods-available/amqp.ini && \
     ln -s /etc/php/7.2/mods-available/amqp.ini /etc/php/7.2/cli/conf.d/30-amqp.ini \