From 6a4083a7a350fb17400fe3e18727a0004e40884d Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 20 Dec 2018 11:32:14 +0100 Subject: [PATCH] Fixes #429 Adding smaller Alpine images where possible --- README.md | 52 ++++++++++++++++---------------- docker-compose.yml | 16 +++++----- env-example | 74 +++++++++++++++++++--------------------------- 3 files changed, 65 insertions(+), 77 deletions(-) diff --git a/README.md b/README.md index 0147d657..87a6a2b8 100644 --- a/README.md +++ b/README.md @@ -183,10 +183,10 @@ Every single attachable container comes with many different versions. In order t 5.5 5.5 5.5 - 9.1 + 9.0 2.8 - 1.4.21 - 2.8 + 1.4 + 2.2 2.4 @@ -195,10 +195,10 @@ Every single attachable container comes with many different versions. In order t 5.6 10.0 5.6 - 9.2 + 9.1 3.0 - 1.4.22 - 3.0 + 1.5 + 2.4 @@ -207,10 +207,10 @@ Every single attachable container comes with many different versions. In order t 5.7 10.1 5.7 - 9.3 + 9.2 3.2 - 1.4.23 - 3.2 + latest + 2.6 @@ -219,10 +219,10 @@ Every single attachable container comes with many different versions. In order t 8.0 10.2 - 9.4 + 9.3 4.0 - 1.4.24 - 3.4 + + 2.8 @@ -231,10 +231,10 @@ Every single attachable container comes with many different versions. In order t 10.3 - 9.5 + 9.4 + 5.0 - ... - 3.5 + 3.0 @@ -243,10 +243,10 @@ Every single attachable container comes with many different versions. In order t - 9.6 - - 1.5.2 + 9.5 + latest + 3.2 @@ -255,10 +255,10 @@ Every single attachable container comes with many different versions. In order t - 10.0 + 9.6 - latest + 3.4 @@ -267,10 +267,10 @@ Every single attachable container comes with many different versions. In order t + ... - - + 3.6 @@ -279,10 +279,10 @@ Every single attachable container comes with many different versions. In order t + 11.1 - - + 4.0 @@ -291,10 +291,10 @@ Every single attachable container comes with many different versions. In order t + latest - - + latest diff --git a/docker-compose.yml b/docker-compose.yml index c99d4b95..064677c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,7 +95,7 @@ services: # PHP / HHVM # ------------------------------------------------------------ php: - image: devilbox/php-fpm:${PHP_SERVER:-7.2}-work-0.56 + image: devilbox/php-fpm:${PHP_SERVER}-work-0.56 ## ## All .env variables @@ -206,7 +206,7 @@ services: # Web Server # ------------------------------------------------------------ httpd: - image: devilbox/${HTTPD_SERVER:-nginx-stable}:0.24 + image: devilbox/${HTTPD_SERVER}:0.24 environment: @@ -251,7 +251,7 @@ services: ## ## PHP-FPM Remote Server ## - - COMPAT=${PHP_SERVER:-7.0} + - COMPAT=${PHP_SERVER} - PHP_FPM_ENABLE=1 - PHP_FPM_SERVER_ADDR=php - PHP_FPM_SERVER_PORT=9000 @@ -299,7 +299,7 @@ services: # MySQL Database # ------------------------------------------------------------ mysql: - image: cytopia/${MYSQL_SERVER:-mariadb-10.1}:latest + image: cytopia/${MYSQL_SERVER}:latest environment: @@ -364,7 +364,7 @@ services: # PostgreSQL # ------------------------------------------------------------ pgsql: - image: postgres:${PGSQL_SERVER:-9.6} + image: postgres:${PGSQL_SERVER} environment: @@ -401,7 +401,7 @@ services: # Redis # ------------------------------------------------------------ redis: - image: redis:${REDIS_SERVER:-3.2} + image: redis:${REDIS_SERVER} # Apply custom arguments to redis startup command: redis-server ${REDIS_ARGS:- } @@ -434,7 +434,7 @@ services: # Memcached # ------------------------------------------------------------ memcd: - image: memcached:${MEMCD_SERVER:-latest} + image: memcached:${MEMCD_SERVER} ports: # [local-machine:]local-port:docker-port @@ -462,7 +462,7 @@ services: # MongoDB # ------------------------------------------------------------ mongo: - image: mongo:${MONGO_SERVER:-latest} + image: mongo:${MONGO_SERVER} ports: # [local-machine:]local-port:docker-port diff --git a/env-example b/env-example index b446d2e8..a2a76532 100644 --- a/env-example +++ b/env-example @@ -253,9 +253,9 @@ HTTPD_SERVER=nginx-stable #MYSQL_SERVER=mysql-8.0 #MYSQL_SERVER=mariadb-5.5 #MYSQL_SERVER=mariadb-10.0 -MYSQL_SERVER=mariadb-10.1 +#MYSQL_SERVER=mariadb-10.1 #MYSQL_SERVER=mariadb-10.2 -#MYSQL_SERVER=mariadb-10.3 +MYSQL_SERVER=mariadb-10.3 #MYSQL_SERVER=percona-5.5 #MYSQL_SERVER=percona-5.6 #MYSQL_SERVER=percona-5.7 @@ -264,69 +264,57 @@ MYSQL_SERVER=mariadb-10.1 ### ### 1.4 Choose PostgreSQL Server Image ### +#PGSQL_SERVER=9.0 #PGSQL_SERVER=9.1 -#PGSQL_SERVER=9.2 -#PGSQL_SERVER=9.3 -#PGSQL_SERVER=9.4 -#PGSQL_SERVER=9.5 -PGSQL_SERVER=9.6 -#PGSQL_SERVER=10.0 -#PGSQL_SERVER=10.1 -#PGSQL_SERVER=10.2 -#PGSQL_SERVER=10.3 +#PGSQL_SERVER=9.2-alpine +#PGSQL_SERVER=9.3-alpine +#PGSQL_SERVER=9.4-alpine +#PGSQL_SERVER=9.5-alpine +#PGSQL_SERVER=9.6-alpine +#PGSQL_SERVER=10.0-alpine +#PGSQL_SERVER=10.1-alpine +#PGSQL_SERVER=10.2-alpine +#PGSQL_SERVER=10.3-alpine +#PGSQL_SERVER=10.4-alpine +#PGSQL_SERVER=10.5-alpine +#PGSQL_SERVER=10.6-alpine +#PGSQL_SERVER=11.0-alpine +PGSQL_SERVER=11.1-alpine +#PGSQL_SERVER=alpine ### ### 1.5 Choose Redis Server Image ### #REDIS_SERVER=2.8 -#REDIS_SERVER=3.0 -#REDIS_SERVER=3.2 -REDIS_SERVER=4.0 -#REDIS_SERVER=5.0-rc +#REDIS_SERVER=3.0-alpine +#REDIS_SERVER=3.2-alpine +#REDIS_SERVER=4.0-alpine +REDIS_SERVER=5.0-alpine +#REDIS_SERVER=alpine ### ### 1.6 Choose Memcached Server Image ### -#MEMCD_SERVER=1.4.21 -#MEMCD_SERVER=1.4.22 -#MEMCD_SERVER=1.4.23 -#MEMCD_SERVER=1.4.24 -#MEMCD_SERVER=1.4.25 -#MEMCD_SERVER=1.4.26 -#MEMCD_SERVER=1.4.27 -#MEMCD_SERVER=1.4.28 -#MEMCD_SERVER=1.4.29 -#MEMCD_SERVER=1.4.30 -#MEMCD_SERVER=1.4.31 -#MEMCD_SERVER=1.4.32 -#MEMCD_SERVER=1.4.33 -#MEMCD_SERVER=1.4.34 -#MEMCD_SERVER=1.4.35 -#MEMCD_SERVER=1.4.36 -#MEMCD_SERVER=1.4.37 -#MEMCD_SERVER=1.4.38 -#MEMCD_SERVER=1.4.39 -#MEMCD_SERVER=1.5.0 -#MEMCD_SERVER=1.5.1 -#MEMCD_SERVER=1.5.2 -#MEMCD_SERVER=1.5.3 -#MEMCD_SERVER=1.5.4 -MEMCD_SERVER=1.5.5 -#MEMCD_SERVER=latest +#MEMCD_SERVER=1.4-alpine +MEMCD_SERVER=1.5-alpine +#MEMCD_SERVER=alpine ### ### 1.7 Choose Mongo Server Image ### +#MONGO_SERVER=2.2 +#MONGO_SERVER=2.4 +#MONGO_SERVER=2.6 #MONGO_SERVER=2.8 #MONGO_SERVER=3.0 #MONGO_SERVER=3.2 #MONGO_SERVER=3.4 -#MONGO_SERVER=3.5 #MONGO_SERVER=3.6 -MONGO_SERVER=3.7 +MONGO_SERVER=4.0 +#MONGO_SERVER=latest