Skip to content

Commit e31072d

Browse files
committed
Restore PHP 5.4 service
1 parent 3b1d8f0 commit e31072d

39 files changed

+421
-361
lines changed

Dockerfile

-34
This file was deleted.

conf/conf.d/certs/localhost/gencert.sh

-26
This file was deleted.

conf/conf.d/certs/localhost/localhost.csr

-12
This file was deleted.

conf/conf.d/certs/localhost/localhost.origin.key

-18
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docker-compose-full.yml

+53-29
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
version: "3"
22
services:
33
nginx:
4-
image: nginx:${NGINX_VERSION}
4+
build:
5+
context: ./services/nginx
6+
args:
7+
NGINX_VERSION: ${NGINX_VERSION}
8+
CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL}
9+
NGINX_INSTALL_APPS: ${NGINX_INSTALL_APPS}
510
ports:
611
- "${NGINX_HTTP_HOST_PORT}:80"
712
- "${NGINX_HTTPS_HOST_PORT}:443"
813
volumes:
9-
- ${SOURCE_DIR}:/var/www/html/:rw
14+
- ${SOURCE_DIR}:/www/:rw
15+
- ${NGINX_SSL_CERTIFICATE_DIR}:/ssl:rw
1016
- ${NGINX_CONFD_DIR}:/etc/nginx/conf.d/:rw
1117
- ${NGINX_CONF_FILE}:/etc/nginx/nginx.conf:ro
1218
- ${NGINX_LOG_DIR}:/var/log/nginx/:rw
@@ -24,7 +30,7 @@ services:
2430
- "${OPENRESTY_HTTP_HOST_PORT}:80"
2531
- "${OPENRESTY_HTTPS_HOST_PORT}:443"
2632
volumes:
27-
- ${SOURCE_DIR}:/var/www/html/:rw
33+
- ${SOURCE_DIR}:/www/:rw
2834
- ${OPENRESTY_CONFD_DIR}:/etc/nginx/conf.d/:ro
2935
- ${OPENRESTY_CONF_FILE}:/usr/local/openresty/nginx/conf/nginx.conf:ro
3036
- ${OPENRESTY_CONF_FASTCGIPARAMS_FILE}:/usr/local/openresty/nginx/conf/fastcgi_params:ro
@@ -34,58 +40,71 @@ services:
3440
networks:
3541
- default
3642

37-
php72:
43+
php:
3844
build:
39-
context: .
45+
context: ./services/php
4046
args:
41-
PHP_VERSION: ${PHP72_VERSION}
42-
ALPINE_REPOSITORIES: ${ALPINE_REPOSITORIES}
43-
PHP_EXTENSIONS: ${PHP72_EXTENSIONS}
47+
PHP_VERSION: php:${PHP_VERSION}-fpm-alpine
48+
CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL}
49+
PHP_EXTENSIONS: ${PHP_EXTENSIONS}
4450
MORE_EXTENSION_INSTALLER: php72.sh
4551
TZ: "$TZ"
4652
volumes:
47-
- ${SOURCE_DIR}:/var/www/html/:rw
48-
- ${PHP72_PHP_CONF_FILE}:/usr/local/etc/php/php.ini:ro
49-
- ${PHP72_FPM_CONF_FILE}:/usr/local/etc/php-fpm.d/www.conf:rw
50-
- ${PHP72_LOG_DIR}:/var/log/php
53+
- ${SOURCE_DIR}:/www/:rw
54+
- ${PHP_PHP_CONF_FILE}:/usr/local/etc/php/php.ini:ro
55+
- ${PHP_FPM_CONF_FILE}:/usr/local/etc/php-fpm.d/www.conf:rw
56+
- ${PHP_LOG_DIR}:/var/log/php
5157
restart: always
5258
cap_add:
5359
- SYS_PTRACE
5460
networks:
5561
- default
5662

57-
php56:
63+
php54:
5864
build:
59-
context: .
65+
context: ./services/php54
6066
args:
61-
PHP_VERSION: ${PHP56_VERSION}
62-
ALPINE_REPOSITORIES: ${ALPINE_REPOSITORIES}
63-
PHP_EXTENSIONS: ${PHP56_EXTENSIONS}
64-
MORE_EXTENSION_INSTALLER: php56.sh
67+
PHP_VERSION: php:${PHP54_VERSION}-fpm
68+
CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL}
69+
PHP_EXTENSIONS: ${PHP54_EXTENSIONS}
6570
TZ: "$TZ"
6671
volumes:
67-
- ${SOURCE_DIR}:/var/www/html/:rw
68-
- ${PHP56_PHP_CONF_FILE}:/usr/local/etc/php/php.ini:ro
69-
- ${PHP56_FPM_CONF_FILE}:/usr/local/etc/php-fpm.d/www.conf:rw
70-
- ${PHP56_LOG_DIR}:/var/log/php
72+
- ${SOURCE_DIR}:/www/:rw
73+
- ${PHP54_PHP_CONF_FILE}:/usr/local/etc/php/php.ini:ro
74+
- ${PHP54_FPM_CONF_FILE}:/usr/local/etc/php-fpm.d/www.conf:rw
75+
- ${PHP54_LOG_DIR}:/var/log/php
7176
restart: always
7277
cap_add:
7378
- SYS_PTRACE
7479
networks:
7580
- default
7681

77-
mysql:
78-
image: mysql:${MYSQL_VERSION}
82+
mysql5:
83+
image: mysql:${MYSQL5_VERSION}
7984
ports:
80-
- "${MYSQL_HOST_PORT}:3306"
85+
- "${MYSQL5_HOST_PORT}:3306"
8186
volumes:
82-
- ${MYSQL_CONF_FILE}:/etc/mysql/conf.d/mysql.cnf:ro
83-
- ${MYSQL_DATA_DIR}:/var/lib/mysql/:rw
87+
- ${MYSQL5_CONF_FILE}:/etc/mysql/conf.d/mysql.cnf:ro
88+
- ${MYSQL5_DATA_DIR}:/var/lib/mysql/:rw
8489
restart: always
8590
networks:
8691
- default
8792
environment:
88-
MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD}"
93+
MYSQL_ROOT_PASSWORD: "${MYSQL5_ROOT_PASSWORD}"
94+
TZ: "$TZ"
95+
96+
mysql8:
97+
image: mysql:${MYSQL8_VERSION}
98+
ports:
99+
- "${MYSQL8_HOST_PORT}:3306"
100+
volumes:
101+
- ${MYSQL8_CONF_FILE}:/etc/mysql/conf.d/mysql.cnf:ro
102+
- ${MYSQL8_DATA_DIR}:/var/lib/mysql/:rw
103+
restart: always
104+
networks:
105+
- default
106+
environment:
107+
MYSQL_ROOT_PASSWORD: "${MYSQL8_ROOT_PASSWORD}"
89108
TZ: "$TZ"
90109

91110
redis:
@@ -173,13 +192,18 @@ services:
173192
- default
174193

175194
elasticsearch:
176-
image: elasticsearch:${ELASTICSEARCH_VERSION}
195+
build:
196+
context: .
197+
args:
198+
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION}
199+
ELASTICSEARCH_EXTENSIONS: ${ELASTICSEARCH_EXTENSIONS}
177200
environment:
178201
- TZ=$TZ
179202
- discovery.type=single-node
180203
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
181204
volumes:
182205
- ${ELASTICSEARCH_DATA_DIR}:/usr/share/elasticsearch/data
206+
- ${ELASTICSEARCH_CONF_FILE}:/usr/share/elasticsearch/elasticsearch.yml
183207
hostname: elasticsearch
184208
restart: always
185209
ports:

env.sample

+46-35
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,38 @@
11
################################################
22
### environment config file ###
33
################################################
4-
SOURCE_DIR=./www
4+
SOURCE_DIR=./source
55

66
############# Timezone for the containers ############
77
TZ=Asia/Shanghai
88

99

10-
############# PHP Alpine Repositories ############
11-
ALPINE_REPOSITORIES=mirrors.aliyun.com
10+
######### Container package fetch url ###########
11+
# Can be empty, followings or others:
12+
# mirrors.163.com
13+
# mirrors.aliyun.com
14+
# mirrors.ustc.edu.cn
15+
##################################################
16+
CONTAINER_PACKAGE_URL=mirrors.aliyun.com
1217

1318

1419
#################### Nginx #####################
1520
NGINX_VERSION=1.15.7-alpine
1621
NGINX_HTTP_HOST_PORT=80
1722
NGINX_HTTPS_HOST_PORT=443
18-
NGINX_CONFD_DIR=./conf/conf.d
19-
NGINX_CONF_FILE=./conf/nginx.conf
20-
NGINX_LOG_DIR=./log/nginx
23+
NGINX_CONFD_DIR=./services/nginx/conf.d
24+
NGINX_CONF_FILE=./services/nginx/nginx.conf
25+
NGINX_SSL_CERTIFICATE_DIR=./services/nginx/ssl
26+
NGINX_LOG_DIR=./logs/nginx
27+
NGINX_INSTALL_APPS=certbot
2128

2229
#################### Openresty #####################
2330
OPENRESTY_VERSION=alpine
2431
OPENRESTY_HTTP_HOST_PORT=80
2532
OPENRESTY_HTTPS_HOST_PORT=443
26-
OPENRESTY_CONFD_DIR=./conf/conf.d
27-
OPENRESTY_CONF_FILE=./conf/openresty.conf
28-
OPENRESTY_CONF_FASTCGIPARAMS_FILE=./conf/fastcgi_params
33+
OPENRESTY_CONFD_DIR=./services/openresty/conf.d
34+
OPENRESTY_CONF_FILE=./services/openresty/openresty.conf
35+
OPENRESTY_CONF_FASTCGIPARAMS_FILE=./services/openresty/fastcgi_params
2936
OPENRESTY_LOG_DIR=./log/nginx
3037

3138
############ PHP extensions #################
@@ -49,21 +56,22 @@ OPENRESTY_LOG_DIR=./log/nginx
4956
#################### end ####################
5057

5158

52-
#################### PHP7.2 ####################
53-
PHP72_VERSION=7.2.19
54-
PHP72_PHP_CONF_FILE=./conf/php.ini
55-
PHP72_FPM_CONF_FILE=./conf/php-fpm.conf
56-
PHP72_LOG_DIR=./log/php
57-
PHP72_EXTENSIONS=pdo_mysql,mysqli,mbstring,gd,curl,opcache
59+
#################### PHP5.6 - PHP7 ####################
60+
PHP_VERSION=7.2.19
61+
PHP_PHP_CONF_FILE=./services/php/php.ini
62+
PHP_FPM_CONF_FILE=./services/php/php-fpm.conf
63+
PHP_LOG_DIR=./log/php
64+
PHP_EXTENSIONS=pdo_mysql,mysqli,mbstring,gd,curl,opcache
5865

5966

60-
#################### PHP5.6 ####################
61-
PHP56_VERSION=5.6.40
62-
PHP56_PHP_CONF_FILE=./conf/php.ini
63-
PHP56_FPM_CONF_FILE=./conf/php-fpm.conf
67+
#################### PHP5.4 ####################
68+
PHP56_VERSION=5.4.45
69+
PHP56_PHP_CONF_FILE=./services/php54/php.ini
70+
PHP56_FPM_CONF_FILE=./services/php54/php-fpm.conf
6471
PHP56_LOG_DIR=./log/php
6572
PHP56_EXTENSIONS=pdo_mysql,mysqli,mbstring,gd,curl,opcache
6673

74+
6775
#################### RABBITMQ #####################
6876
RABBITMQ_VERSION=management
6977
RABBITMQ_HOST_PORT_C=5672
@@ -73,17 +81,19 @@ RABBITMQ_DEFAULT_PASS=mypass
7381

7482
#################### MONGODB #####################
7583
MONGODB_VERSION=4.1
76-
MONGODB_DATA_DIR=./mongo
84+
MONGODB_DATA_DIR=./data/mongo
7785
MONGODB_HOST_PORT=27017
7886
MONGODB_INITDB_ROOT_USERNAME=root
7987
MONGODB_INITDB_ROOT_PASSWORD=123456
8088

8189
#################### ELASTICSEARCH #####################
8290
ELASTICSEARCH_VERSION=7.1.1
83-
ELASTICSEARCH_HOSTNAME=kibana
84-
ELASTICSEARCH_DATA_DIR=./esdata
91+
ELASTICSEARCH_DATA_DIR=./data/esdata
92+
ELASTICSEARCH_CONF_FILE=./services/elasticsearch/elasticsearch.yml
8593
ELASTICSEARCH_HOST_PORT_C=9200
8694
ELASTICSEARCH_HOST_PORT_S=9300
95+
# Options: analysis-ik,analysis-pinyin
96+
ELASTICSEARCH_EXTENSIONS=analysis-ik,analysis-pinyin
8797

8898
#################### KIBANA #####################
8999
KIBANA_VERSION=7.1.1
@@ -95,18 +105,25 @@ LOGSTASH_HOST=5601
95105
LOGSTASH_HOST_PORT_C=9600
96106
LOGSTASH_HOST_PORT_S=5044
97107

98-
#################### MySQL #####################
99-
MYSQL_VERSION=8.0.13
100-
MYSQL_HOST_PORT=3306
101-
MYSQL_ROOT_PASSWORD=123456
102-
MYSQL_DATA_DIR=./mysql
103-
MYSQL_CONF_FILE=./conf/mysql.cnf
108+
#################### MySQL5 #####################
109+
MYSQL5_VERSION=5.7.29
110+
MYSQL5_HOST_PORT=3305
111+
MYSQL5_ROOT_PASSWORD=123456
112+
MYSQL5_DATA_DIR=./data/mysql5
113+
MYSQL5_CONF_FILE=./services/mysql5/mysql.cnf
114+
115+
#################### MySQL8 #####################
116+
MYSQL8_VERSION=8.0.13
117+
MYSQL8_HOST_PORT=3306
118+
MYSQL8_ROOT_PASSWORD=123456
119+
MYSQL8_DATA_DIR=./data/mysql8
120+
MYSQL8_CONF_FILE=./services/mysql8/mysql.cnf
104121

105122

106123
#################### Redis #####################
107124
REDIS_VERSION=5.0.3-alpine
108125
REDIS_HOST_PORT=6379
109-
REDIS_CONF_FILE=./conf/redis.conf
126+
REDIS_CONF_FILE=./services/redis/redis.conf
110127

111128
#################### Memcached #####################
112129
MEMCACHED_VERSION=alpine
@@ -123,9 +140,3 @@ REDISMYADMIN_HOST_PORT=8081
123140

124141
################# AdminMongo #################
125142
ADMINMONGO_HOST_PORT=1234
126-
127-
#################### LOCALTIME #####################
128-
LOCALTIME_DIR=./conf/localtime
129-
130-
#################### TIMEZONE #####################
131-
TIMEZONE_DIR=./conf/timezone

0 commit comments

Comments
 (0)