Skip to content

Commit a39d049

Browse files
committed
Prefix default services
1 parent 559ed12 commit a39d049

File tree

1 file changed

+24
-10
lines changed

1 file changed

+24
-10
lines changed

bin/dev-stack.sh

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,42 +94,42 @@ volume_path() {
9494
}
9595

9696
setup_services() {
97-
if [[ ${HAS_PROXY:-1} == 1 ]]; then
97+
if [[ $HAS_PROXY == 1 ]]; then
9898
start_service "n_jw_proxy_${NETWORK_NAME}" "-p ${REMOTE_PROXY_PORT}:80 -v /var/run/docker.sock:/tmp/docker.sock:ro -v ${DEV_STACK_BASE}/src/docker/proxy.conf:/etc/nginx/conf.d/my_proxy.conf:ro jwilder/nginx-proxy@sha256:53004448ff1b987e2ae01841365b7f121c75c7928a3c4621cde69ac498badcff"
9999
fi
100100

101-
if [[ ${HAS_DB:-1} == 1 ]]; then
101+
if [[ $HAS_DB == 1 ]]; then
102102
DATA=$(volume_path 'mysql')
103103
start_service "${PREFIX}mysql" "--env MYSQL_USER=dev --env MYSQL_ROOT_PASSWORD=dev -v ${DATA}:/var/lib/mysql ${DB_VERSION:-mariadb:10.2.18}"
104104

105105
start_service "${PREFIX}adminer" "--user www-data:www-data --env VIRTUAL_HOST=adminer.localhost --env ADMINER_DESIGN=nette --env NETWORK_ACCESS=internal --env ADMINER_DEFAULT_SERVER=${PREFIX}mysql adminer@sha256:983035c7ace2a1c300226fb7e901498eb7af0707ee4c8128d12d6460b07995c9" # 4.7.7-standalone
106106
fi
107107

108-
if [[ ${HAS_RABBIT:-1} == 1 ]]; then
108+
if [[ $HAS_RABBIT == 1 ]]; then
109109
DATA=$(volume_path 'rabbitmq')
110110
start_service "${PREFIX}rabbitmq" "--hostname rabbitmq --env VIRTUAL_HOST=rabbitmq.localhost --env VIRTUAL_PORT=15672 --env RABBITMQ_DEFAULT_USER=dev --env RABBITMQ_DEFAULT_PASS=dev --env NETWORK_ACCESS=internal --env RABBITMQ_NODENAME=bunny1@rabbitmq -v ${DATA}:/var/lib/rabbitmq ${RABBITMQ_VERSION:-rabbitmq:3.6.12-management-alpine}"
111111
fi
112112

113-
if [[ ${HAS_REDIS:-1} == 1 ]]; then
113+
if [[ $HAS_REDIS == 1 ]]; then
114114
DATA=$(volume_path 'redis')
115115
start_service "${PREFIX}redis" "-v ${DATA}:/data ${REDIS_VERSION:-redis:3.2.12-alpine}"
116116
fi
117117
}
118118

119119
create_volumes() {
120-
if [[ ${HAS_DB:-1} == 1 ]]; then
120+
if [[ $HAS_DB == 1 ]]; then
121121
if [[ ! $(docker volume ls | grep "v_${PREFIX}mysql") ]]; then
122122
docker volume create --name="v_${PREFIX}mysql"
123123
fi
124124
fi
125125

126-
if [[ ${HAS_REDIS:-1} == 1 ]]; then
126+
if [[ $HAS_REDIS == 1 ]]; then
127127
if [[ ! $(docker volume ls | grep "v_${PREFIX}redis") ]]; then
128128
docker volume create --name="v_${PREFIX}redis"
129129
fi
130130
fi
131131

132-
if [[ ${HAS_RABBIT:-1} == 1 ]]; then
132+
if [[ $HAS_RABBIT == 1 ]]; then
133133
if [[ ! $(docker volume ls | grep "v_${PREFIX}rabbitmq") ]]; then
134134
docker volume create --name="v_${PREFIX}rabbitmq"
135135
fi
@@ -148,14 +148,14 @@ list_services() {
148148
echo ""
149149
echo "Webserver at http://${PROJECT_NAME}.localhost:${PROXY_PORT} (http://$(service_ip ${WEBSERVER_NAME}))"
150150
echo ""
151-
if [[ ${HAS_DB:-1} == 1 ]]; then
151+
if [[ $HAS_DB == 1 ]]; then
152152
echo "Adminer: http://adminer.localhost:${PROXY_PORT} (http://$(service_ip ${PREFIX}adminer):8080)"
153153
echo "Mysql: $(service_ip ${PREFIX}mysql):3306"
154154
fi
155-
if [[ ${HAS_RABBIT:-1} == 1 ]]; then
155+
if [[ $HAS_RABBIT == 1 ]]; then
156156
echo "Rabbitmq management: http://rabbitmq.localhost:${PROXY_PORT} (http://$(service_ip ${PREFIX}rabbitmq):15672)"
157157
fi
158-
if [[ ${HAS_REDIS:-1} == 1 ]]; then
158+
if [[ $HAS_REDIS == 1 ]]; then
159159
echo "Redis: $(service_ip ${PREFIX}redis):6378"
160160
fi
161161
echo ""
@@ -176,6 +176,20 @@ export APACHE_LOG_LEVEL=${APACHE_LOG_LEVEL:-'warn'}
176176
export GATEWAY=$(docker network inspect $NETWORK_NAME | grep 'Gateway' | grep -ohE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')
177177
source <(sed 's/^/export /' $CONFIG_FILE)
178178

179+
# Prefix's defaults services
180+
if [[ $PREFIX == 'solcloud_' ]]; then
181+
[ -z $HAS_PROXY ] && HAS_PROXY=1
182+
[ -z $HAS_DB ] && HAS_DB=1
183+
[ -z $HAS_RABBIT ] && HAS_RABBIT=1
184+
[ -z $HAS_REDIS ] && HAS_REDIS=1
185+
else
186+
[ -z $HAS_PROXY ] && HAS_PROXY=0
187+
[ -z $HAS_DB ] && HAS_DB=0
188+
[ -z $HAS_RABBIT ] && HAS_RABBIT=0
189+
[ -z $HAS_REDIS ] && HAS_REDIS=0
190+
fi
191+
export DOCUMENT_ROOT=''
192+
179193
compose_up() {
180194
create_volumes
181195
setup_network

0 commit comments

Comments
 (0)