#39 fix install script: check/create docker network; no web host port binding

已合併
tunefish 8 月之前 將 1 次代碼提交從 hostbbq/sec/net-ip-port合併至 hostbbq/master
共有 2 個文件被更改,包括 3 次插入11 次删除
  1. 0 4
      server.docker-compose.yml
  2. 3 7
      server/install/install.sh

+ 0 - 4
server.docker-compose.yml

@@ -10,8 +10,6 @@ services:
     environment:
       - GOOGLE_APPLICATION_CREDENTIALS=google-cloud/firebase-adminsdk.json
       - NOTIFICATION_ICON_URL=https://fcm.hostbbq.net/logo.png
-    ports:
-      - $HOST_PORT:$WEB_PORT
     networks:
       hostbbq-monitoring-vlan:
         ipv4_address: 172.20.5.2
@@ -24,8 +22,6 @@ services:
     build:
       context: server/mysql
     image: monitoring-mariadb:latest
-    ports:
-      - 172.20.5.3:3306:3306
     networks:
       hostbbq-monitoring-vlan:
         ipv4_address: 172.20.5.3

+ 3 - 7
server/install/install.sh

@@ -80,14 +80,10 @@ cd "$INSTALL_DIR"
 
 DOCKER_NETWORK_NAME=hostbbq-monitoring-vlan
 if ! docker network inspect ${DOCKER_NETWORK_NAME} > /dev/null 2>&1; then
-  if [[ "${COMMAND}" == "up" ]]; then
-    echo "⭐ Creating network '${DOCKER_NETWORK_NAME}'..."
-    docker network create --subnet=172.20.5.0/24 "${DOCKER_NETWORK_NAME}"
-  fi
+  echo "⭐ Creating network '${DOCKER_NETWORK_NAME}'..."
+  docker network create --subnet=172.20.5.0/24 "${DOCKER_NETWORK_NAME}"
 else
-  if [[ "${COMMAND}" == "up" ]]; then
-    echo "✔ Network '${DOCKER_NETWORK_NAME}' exists."
-  fi
+  echo "✔ Network '${DOCKER_NETWORK_NAME}' exists."
 fi
 
 COMPOSE_PROJECT_NAME="monitoring-server" \