Merge pull request #1434 from bestlong/sort-up

Sort up
This commit is contained in:
Yu-Lung Shao (Allen) 2018-03-16 18:34:53 +08:00 committed by GitHub
commit 436e9e5a66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 86 additions and 33 deletions

62
.gitlab-ci.yml Normal file
View File

@ -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

View File

@ -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 <partounian@gmail.com>
LABEL maintainer="Patrick Artounian <partounian@gmail.com>"
# Add volume for sessions to allow session persistence
VOLUME /sessions

View File

@ -1,6 +1,6 @@
FROM aerospike:latest
MAINTAINER Luciano Jr <luciano@lucianojr.com.br>
LABEL maintainer="Luciano Jr <luciano@lucianojr.com.br>"
RUN rm /etc/aerospike/aerospike.conf

View File

@ -1,6 +1,6 @@
FROM webdevops/apache:ubuntu-16.04
MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
LABEL maintainer="Eric Pfeiffer <computerfr33k@users.noreply.github.com>"
ARG PHP_UPSTREAM_CONTAINER=php-fpm
ARG PHP_UPSTREAM_PORT=9000

View File

@ -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

View File

@ -1,6 +1,6 @@
FROM php:latest
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
RUN apt-get update && apt-get install -y curl

View File

@ -1,6 +1,6 @@
FROM phusion/baseimage:latest
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
ENV DEBIAN_FRONTEND noninteractive
ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

View File

@ -1,7 +1,6 @@
FROM zuohuadong/caddy:alpine
MAINTAINER Huadong Zuo <admin@zuohuadong.cn>
LABEL maintainer="Huadong Zuo <admin@zuohuadong.cn>"
ARG plugins="cors"

View File

@ -1,6 +1,6 @@
FROM phusion/baseimage:latest
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
COPY run-certbot.sh /root/certbot/run-certbot.sh

View File

@ -1,5 +1,5 @@
FROM dockercloud/haproxy:latest
MAINTAINER ZeroC0D3 Team<zeroc0d3.team@gmail.com>
LABEL maintainer="ZeroC0D3 Team<zeroc0d3.team@gmail.com>"
EXPOSE 80

View File

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

View File

@ -1,5 +1,5 @@
FROM djfarrelly/maildev
MAINTAINER Maxime Hélias <maximehelias16@gmail.com>
LABEL maintainer="Maxime Hélias <maximehelias16@gmail.com>"
EXPOSE 80 25

View File

@ -1,6 +1,6 @@
FROM mailhog/mailhog
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
CMD ["Mailhog"]

View File

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

View File

@ -1,6 +1,6 @@
FROM microsoft/mssql-server-linux
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
# Create config directory
# an set it as WORKDIR

View File

@ -14,7 +14,7 @@
FROM laradock/php-fpm:2.0-56
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
#
#--------------------------------------------------------------------------

View File

@ -14,7 +14,7 @@
FROM laradock/php-fpm:2.0-70
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
#
#--------------------------------------------------------------------------

View File

@ -14,7 +14,7 @@
FROM laradock/php-fpm:2.0-71
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
#
#--------------------------------------------------------------------------

View File

@ -14,7 +14,7 @@
FROM laradock/php-fpm:2.0-72
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
#
#--------------------------------------------------------------------------

View File

@ -14,7 +14,7 @@
FROM laradock/workspace:2.0-56
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
# 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 \

View File

@ -14,7 +14,7 @@
FROM laradock/workspace:2.0-70
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
# 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 \

View File

@ -14,7 +14,7 @@
FROM laradock/workspace:2.0-71
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
# 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 \

View File

@ -14,7 +14,7 @@
FROM laradock/workspace:2.0-72
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
# 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 \