Skip to content

Commit 436e9e5

Browse files
bestlongbestlong
authored
Merge pull request laradock#1434 from bestlong/sort-up
Sort up
2 parents 91784cb + b445479 commit 436e9e5

23 files changed

+86
-33
lines changed

‎.gitlab-ci.yml

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# image: docker:latest
2+
# services:
3+
# - docker:dind
4+
image: jonaskello/docker-and-compose:1.12.1-1.8.0
5+
services:
6+
- docker:1.12.1-dind
7+
8+
before_script:
9+
- docker info
10+
- docker-compose version
11+
- cp env-example .env
12+
- sed -i -- "s/=false/=true/g" .env
13+
- cat .env
14+
- env | sort
15+
16+
build:56:php-fpm:
17+
variables:
18+
PHP_VERSION: "56"
19+
script:
20+
- docker-compose build php-fpm
21+
22+
build:70:php-fpm:
23+
variables:
24+
PHP_VERSION: "70"
25+
script:
26+
- docker-compose build php-fpm
27+
28+
build:71:php-fpm:
29+
variables:
30+
PHP_VERSION: "71"
31+
script:
32+
- docker-compose build php-fpm
33+
34+
build:72:php-fpm:
35+
variables:
36+
PHP_VERSION: "72"
37+
script:
38+
- docker-compose build php-fpm
39+
40+
build:56:workspace:
41+
variables:
42+
PHP_VERSION: "56"
43+
script:
44+
- docker-compose build workspace
45+
46+
build:70:workspace:
47+
variables:
48+
PHP_VERSION: "70"
49+
script:
50+
- docker-compose build workspace
51+
52+
build:71:workspace:
53+
variables:
54+
PHP_VERSION: "71"
55+
script:
56+
- docker-compose build workspace
57+
58+
build:72:workspace:
59+
variables:
60+
PHP_VERSION: "72"
61+
script:
62+
- docker-compose build workspace

‎adminer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM adminer:4.3.0
33
# Version 4.3.1 contains PostgreSQL login errors. See docs.
44
# See https://sourceforge.net/p/adminer/bugs-and-features/548/
55

6-
MAINTAINER Patrick Artounian <[email protected]>
6+
LABEL maintainer="Patrick Artounian <[email protected]>"
77

88
# Add volume for sessions to allow session persistence
99
VOLUME /sessions

‎aerospike/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM aerospike:latest
22

3-
MAINTAINER Luciano Jr <[email protected]>
3+
LABEL maintainer="Luciano Jr <[email protected]>"
44

55
RUN rm /etc/aerospike/aerospike.conf
66

7-
ADD aerospike.conf /etc/aerospike/aerospike.conf
7+
ADD aerospike.conf /etc/aerospike/aerospike.conf

‎apache2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM webdevops/apache:ubuntu-16.04
22

3-
MAINTAINER Eric Pfeiffer <[email protected]>
3+
LABEL maintainer="Eric Pfeiffer <[email protected]>"
44

55
ARG PHP_UPSTREAM_CONTAINER=php-fpm
66
ARG PHP_UPSTREAM_PORT=9000

‎aws/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM python:slim
22

3-
MAINTAINER [email protected]
3+
LABEL maintainer="[email protected]"
44

55
RUN pip install --upgrade --no-cache-dir awsebcli
66
RUN apt-get -yqq update && apt-get -yqq install git-all

‎beanstalkd-console/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM php:latest
22

3-
MAINTAINER Mahmoud Zalt <[email protected]>
3+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
44

55
RUN apt-get update && apt-get install -y curl
66

‎beanstalkd/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM phusion/baseimage:latest
22

3-
MAINTAINER Mahmoud Zalt <[email protected]>
3+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
44

55
ENV DEBIAN_FRONTEND noninteractive
66
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
1313

1414
EXPOSE 11300
1515

16-
CMD ["/usr/bin/beanstalkd"]
16+
CMD ["/usr/bin/beanstalkd"]

‎caddy/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM zuohuadong/caddy:alpine
22

3-
4-
MAINTAINER Huadong Zuo <[email protected]>
3+
LABEL maintainer="Huadong Zuo <[email protected]>"
54

65
ARG plugins="cors"
76

‎certbot/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM phusion/baseimage:latest
22

3-
MAINTAINER Mahmoud Zalt <[email protected]>
3+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
44

55
COPY run-certbot.sh /root/certbot/run-certbot.sh
66

‎haproxy/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM dockercloud/haproxy:latest
22

3-
MAINTAINER ZeroC0D3 Team<[email protected]>
3+
LABEL maintainer="ZeroC0D3 Team<[email protected]>"
44

55
EXPOSE 80

‎hhvm/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:14.04
22

3-
MAINTAINER Mahmoud Zalt <[email protected]>
3+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
44

55
RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449
66

‎maildev/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM djfarrelly/maildev
22

3-
MAINTAINER Maxime Hélias <[email protected]>
3+
LABEL maintainer="Maxime Hélias <[email protected]>"
44

55
EXPOSE 80 25

‎mailhog/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM mailhog/mailhog
22

3-
MAINTAINER Mahmoud Zalt <[email protected]>
3+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
44

55
CMD ["Mailhog"]
66

‎mariadb/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM mariadb:latest
22

3-
MAINTAINER Mahmoud Zalt <[email protected]>
3+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
44

55
ADD my.cnf /etc/mysql/conf.d/my.cnf
66

‎mssql/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM microsoft/mssql-server-linux
22

3-
MAINTAINER Mahmoud Zalt <[email protected]>
3+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
44

55
# Create config directory
66
# an set it as WORKDIR

‎php-fpm/Dockerfile-56

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
FROM laradock/php-fpm:2.0-56
1616

17-
MAINTAINER Mahmoud Zalt <[email protected]>
17+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
1818

1919
#
2020
#--------------------------------------------------------------------------

‎php-fpm/Dockerfile-70

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
FROM laradock/php-fpm:2.0-70
1616

17-
MAINTAINER Mahmoud Zalt <[email protected]>
17+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
1818

1919
#
2020
#--------------------------------------------------------------------------

‎php-fpm/Dockerfile-71

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
FROM laradock/php-fpm:2.0-71
1616

17-
MAINTAINER Mahmoud Zalt <[email protected]>
17+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
1818

1919
#
2020
#--------------------------------------------------------------------------

‎php-fpm/Dockerfile-72

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
FROM laradock/php-fpm:2.0-72
1616

17-
MAINTAINER Mahmoud Zalt <[email protected]>
17+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
1818

1919
#
2020
#--------------------------------------------------------------------------

‎workspace/Dockerfile-56

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
FROM laradock/workspace:2.0-56
1616

17-
MAINTAINER Mahmoud Zalt <[email protected]>
17+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
1818

1919
# Remove Faillog and Lastlog to reduce the size of the final image.
2020
RUN rm /var/log/lastlog /var/log/faillog
@@ -233,12 +233,10 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
233233
# AMQP:
234234
#####################################
235235

236-
# Check if Mongo needs to be installed
237236
ARG INSTALL_AMQP=false
238237
ENV INSTALL_AMQP ${INSTALL_AMQP}
239238
RUN if [ ${INSTALL_AMQP} = true ]; then \
240239
apt-get install librabbitmq-dev -y && \
241-
# Install the mongodb extension
242240
pecl -q install amqp && \
243241
echo "extension=amqp.so" >> /etc/php/5.6/mods-available/amqp.ini && \
244242
ln -s /etc/php/5.6/mods-available/amqp.ini /etc/php/5.6/cli/conf.d/30-amqp.ini \

‎workspace/Dockerfile-70

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
FROM laradock/workspace:2.0-70
1616

17-
MAINTAINER Mahmoud Zalt <[email protected]>
17+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
1818

1919
# Remove Faillog and Lastlog to reduce the size of the final image.
2020
RUN rm /var/log/lastlog /var/log/faillog
@@ -229,12 +229,10 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
229229
# AMQP:
230230
#####################################
231231

232-
# Check if Mongo needs to be installed
233232
ARG INSTALL_AMQP=false
234233
ENV INSTALL_AMQP ${INSTALL_AMQP}
235234
RUN if [ ${INSTALL_AMQP} = true ]; then \
236235
apt-get install librabbitmq-dev -y && \
237-
# Install the mongodb extension
238236
pecl -q install amqp && \
239237
echo "extension=amqp.so" >> /etc/php/7.0/mods-available/amqp.ini && \
240238
ln -s /etc/php/7.0/mods-available/amqp.ini /etc/php/7.0/cli/conf.d/30-amqp.ini \

‎workspace/Dockerfile-71

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
FROM laradock/workspace:2.0-71
1616

17-
MAINTAINER Mahmoud Zalt <[email protected]>
17+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
1818

1919
# Remove Faillog and Lastlog to reduce the size of the final image.
2020
RUN rm /var/log/lastlog /var/log/faillog
@@ -225,12 +225,10 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
225225
# AMQP:
226226
#####################################
227227

228-
# Check if Mongo needs to be installed
229228
ARG INSTALL_AMQP=false
230229
ENV INSTALL_AMQP ${INSTALL_AMQP}
231230
RUN if [ ${INSTALL_AMQP} = true ]; then \
232231
apt-get install librabbitmq-dev -y && \
233-
# Install the mongodb extension
234232
pecl -q install amqp && \
235233
echo "extension=amqp.so" >> /etc/php/7.1/mods-available/amqp.ini && \
236234
ln -s /etc/php/7.1/mods-available/amqp.ini /etc/php/7.1/cli/conf.d/30-amqp.ini \

‎workspace/Dockerfile-72

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
FROM laradock/workspace:2.0-72
1616

17-
MAINTAINER Mahmoud Zalt <[email protected]>
17+
LABEL maintainer="Mahmoud Zalt <[email protected]>"
1818

1919
# Remove Faillog and Lastlog to reduce the size of the final image.
2020
RUN rm /var/log/lastlog /var/log/faillog
@@ -225,12 +225,10 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
225225
# AMQP:
226226
#####################################
227227

228-
# Check if Mongo needs to be installed
229228
ARG INSTALL_AMQP=false
230229
ENV INSTALL_AMQP ${INSTALL_AMQP}
231230
RUN if [ ${INSTALL_AMQP} = true ]; then \
232231
apt-get install librabbitmq-dev -y && \
233-
# Install the mongodb extension
234232
pecl -q install amqp && \
235233
echo "extension=amqp.so" >> /etc/php/7.2/mods-available/amqp.ini && \
236234
ln -s /etc/php/7.2/mods-available/amqp.ini /etc/php/7.2/cli/conf.d/30-amqp.ini \

0 commit comments

Comments
 (0)