diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..520574e --- /dev/null +++ b/.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 diff --git a/adminer/Dockerfile b/adminer/Dockerfile index 818c8e1..fb66a3e 100644 --- a/adminer/Dockerfile +++ b/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 +LABEL maintainer="Patrick Artounian " # Add volume for sessions to allow session persistence VOLUME /sessions diff --git a/aerospike/Dockerfile b/aerospike/Dockerfile index 665a279..e4a6e27 100644 --- a/aerospike/Dockerfile +++ b/aerospike/Dockerfile @@ -1,7 +1,7 @@ FROM aerospike:latest -MAINTAINER Luciano Jr +LABEL maintainer="Luciano Jr " RUN rm /etc/aerospike/aerospike.conf -ADD aerospike.conf /etc/aerospike/aerospike.conf \ No newline at end of file +ADD aerospike.conf /etc/aerospike/aerospike.conf diff --git a/apache2/Dockerfile b/apache2/Dockerfile index 9624d97..d15d008 100644 --- a/apache2/Dockerfile +++ b/apache2/Dockerfile @@ -1,6 +1,6 @@ FROM webdevops/apache:ubuntu-16.04 -MAINTAINER Eric Pfeiffer +LABEL maintainer="Eric Pfeiffer " ARG PHP_UPSTREAM_CONTAINER=php-fpm ARG PHP_UPSTREAM_PORT=9000 diff --git a/aws/Dockerfile b/aws/Dockerfile index 4f03e9d..44dd136 100644 --- a/aws/Dockerfile +++ b/aws/Dockerfile @@ -1,6 +1,6 @@ FROM python:slim -MAINTAINER melchabcede@gmail.com +LABEL maintainer="melchabcede@gmail.com" RUN pip install --upgrade --no-cache-dir awsebcli RUN apt-get -yqq update && apt-get -yqq install git-all diff --git a/beanstalkd-console/Dockerfile b/beanstalkd-console/Dockerfile index b07f1e3..1a768bd 100644 --- a/beanstalkd-console/Dockerfile +++ b/beanstalkd-console/Dockerfile @@ -1,6 +1,6 @@ FROM php:latest -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " RUN apt-get update && apt-get install -y curl diff --git a/beanstalkd/Dockerfile b/beanstalkd/Dockerfile index ea1f87a..b95a351 100644 --- a/beanstalkd/Dockerfile +++ b/beanstalkd/Dockerfile @@ -1,6 +1,6 @@ FROM phusion/baseimage:latest -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " 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"] \ No newline at end of file +CMD ["/usr/bin/beanstalkd"] diff --git a/caddy/Dockerfile b/caddy/Dockerfile index 70d69c3..92b5bab 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -1,7 +1,6 @@ FROM zuohuadong/caddy:alpine - -MAINTAINER Huadong Zuo +LABEL maintainer="Huadong Zuo " ARG plugins="cors" diff --git a/certbot/Dockerfile b/certbot/Dockerfile index 3ce7546..ad95113 100644 --- a/certbot/Dockerfile +++ b/certbot/Dockerfile @@ -1,6 +1,6 @@ FROM phusion/baseimage:latest -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " COPY run-certbot.sh /root/certbot/run-certbot.sh diff --git a/haproxy/Dockerfile b/haproxy/Dockerfile index ceca719..c614892 100644 --- a/haproxy/Dockerfile +++ b/haproxy/Dockerfile @@ -1,5 +1,5 @@ FROM dockercloud/haproxy:latest -MAINTAINER ZeroC0D3 Team +LABEL maintainer="ZeroC0D3 Team" EXPOSE 80 diff --git a/hhvm/Dockerfile b/hhvm/Dockerfile index 92b8905..1b10cde 100644 --- a/hhvm/Dockerfile +++ b/hhvm/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:14.04 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 diff --git a/maildev/Dockerfile b/maildev/Dockerfile index 4484c83..c12e3ba 100644 --- a/maildev/Dockerfile +++ b/maildev/Dockerfile @@ -1,5 +1,5 @@ FROM djfarrelly/maildev -MAINTAINER Maxime Hélias +LABEL maintainer="Maxime Hélias " EXPOSE 80 25 diff --git a/mailhog/Dockerfile b/mailhog/Dockerfile index 4b404d1..4565461 100644 --- a/mailhog/Dockerfile +++ b/mailhog/Dockerfile @@ -1,6 +1,6 @@ FROM mailhog/mailhog -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " CMD ["Mailhog"] diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index fa25b26..05b984f 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -1,6 +1,6 @@ FROM mariadb:latest -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " ADD my.cnf /etc/mysql/conf.d/my.cnf diff --git a/mssql/Dockerfile b/mssql/Dockerfile index de67f6d..2d9e5ac 100644 --- a/mssql/Dockerfile +++ b/mssql/Dockerfile @@ -1,6 +1,6 @@ FROM microsoft/mssql-server-linux -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # Create config directory # an set it as WORKDIR diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 9081707..93bc0ba 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -14,7 +14,7 @@ FROM laradock/php-fpm:2.0-56 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # #-------------------------------------------------------------------------- diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index b2cb129..f0dfb44 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -14,7 +14,7 @@ FROM laradock/php-fpm:2.0-70 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # #-------------------------------------------------------------------------- diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 7ed0f75..13c6001 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -14,7 +14,7 @@ FROM laradock/php-fpm:2.0-71 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # #-------------------------------------------------------------------------- diff --git a/php-fpm/Dockerfile-72 b/php-fpm/Dockerfile-72 index ddde409..0a372a2 100644 --- a/php-fpm/Dockerfile-72 +++ b/php-fpm/Dockerfile-72 @@ -14,7 +14,7 @@ FROM laradock/php-fpm:2.0-72 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # #-------------------------------------------------------------------------- diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 616ae4b..52d2a00 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -14,7 +14,7 @@ FROM laradock/workspace:2.0-56 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # 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 \ diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 6cd2a3d..384dbbd 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -14,7 +14,7 @@ FROM laradock/workspace:2.0-70 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # 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 \ diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 1348914..b5521c7 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -14,7 +14,7 @@ FROM laradock/workspace:2.0-71 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # 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 \ diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index 8097632..3a042ee 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -14,7 +14,7 @@ FROM laradock/workspace:2.0-72 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # 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 \