octoleo/octojoom
21
6
Fork 0
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Makes the docker network values changeable.

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2021-12-31 12:31:54 +02:00
parent 2918326c8c
commit 76db2f477b
Signed by: Llewellyn
GPG Key ID: EFC0C720A240551C
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/octojoom
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# The most recent program version. # The most recent program version.
_VERSION="3.1.0" _VERSION="3.1.5"
_V="3.1" _V="3.1"
# The program full name # The program full name
@ -22,6 +22,11 @@ command -v docker-compose >/dev/null 2>&1 || {
echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script require docker-compose." echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script require docker-compose."
exit 1 exit 1
} }
# make sure curl is installed
command -v curl >/dev/null 2>&1 || {
echo >&2 "ERROR: ${PROGRAM_NAME} v${_VERSION} script require curl."
exit 1
}
# just clear the screen # just clear the screen
clear clear
@ -143,7 +148,7 @@ ${VDM_REMOVE_SECURE} - "traefik.http.middlewares.redirect-to-me.redirectsch
networks: networks:
traefik: traefik:
external: external:
name: traefik_webgateway name: ${VDM_TRAEFIK_GATEWAY:-traefik_webgateway}
EOF EOF
} }
@ -240,7 +245,7 @@ volumes:
networks: networks:
traefik: traefik:
external: external:
name: traefik_webgateway name: ${VDM_TRAEFIK_GATEWAY:-traefik_webgateway}
EOF EOF
} }
@ -527,7 +532,7 @@ ${VDM_REMOVE_SECURE} - "traefik.http.services.phpmyadmin_${VDM_KEY}.loadbal
networks: networks:
traefik: traefik:
external: external:
name: traefik_webgateway name: ${VDM_TRAEFIK_GATEWAY:-traefik_webgateway}
${VDM_VOLUMES} ${VDM_VOLUMES}
@ -747,7 +752,7 @@ services:
networks: networks:
openssh: openssh:
external: external:
name: openssh_gateway name: ${VDM_OPENSSH_GATEWAY:-openssh_gateway}
EOF EOF
} }
@ -3168,10 +3173,10 @@ function setSecureState() {
# set the networks in place # set the networks in place
function setNetworks() { function setNetworks() {
# we create the networks # we create the networks
docker network inspect traefik_webgateway >/dev/null 2>&1 || docker network inspect "${VDM_TRAEFIK_GATEWAY:-traefik_webgateway}" >/dev/null 2>&1 ||
docker network create traefik_webgateway --subnet 172.22.0.0/24 docker network create "${VDM_TRAEFIK_GATEWAY:-traefik_webgateway}" --subnet "${VDM_TRAEFIK_SUBNET:-172.22.0.0/24}"
docker network inspect openssh_gateway >/dev/null 2>&1 || docker network inspect "${VDM_OPENSSH_GATEWAY:-openssh_gateway}" >/dev/null 2>&1 ||
docker network create openssh_gateway --subnet 172.23.0.0/24 docker network create "${VDM_OPENSSH_GATEWAY:-openssh_gateway}" --subnet "${VDM_OPENSSH_SUBNET:-172.23.0.0/24}"
} }
# to set a global Env Variable # to set a global Env Variable