Merge pull request #414 from Websoft9/ruixian_1805

Ruixian 1805
Websoft9 · Nov 29, 2023 · bc22239 · bc22239
2 parents 846d908 + 743ad79
commit bc22239
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 81 deletions.
diff --git a/apps/teleport/.env b/apps/teleport/.env
@@ -1,15 +1,23 @@
 W9_POWER_PASSWO=1PrMxExC45Ls3T
 
-W9_NAME=teleport
+W9_ID=teleport
 W9_REPO=public.ecr.aws/gravitational/teleport
 
 # get version from: https://gallery.ecr.aws/gravitational/teleport
 W9_VERSION=14-amd64
 
-# port, W9_PORT is need at leaset
-W9_HTTP_PORT=9001
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=3080
+W9_HTTP_PORT_SET=9001
+W9_3023_PORT=3023
+W9_3023_PORT_SET=3023
+W9_3025_PORT=3025
+W9_3025_PORT_SET=3025
+
+W9_NETWORK=websoft9
 W9_USER=admin
 W9_PASSWORD=$W9_POWER_PASSWO
-W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_URL=appname.example.com
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/teleport/docker-compose.yml b/apps/teleport/docker-compose.yml
@@ -8,28 +8,30 @@ version: '3.8'
 services:
   teleport-configure:
     image: $W9_REPO:$W9_VERSION
-    container_name: $W9_NAME-configure
+    container_name: $W9_ID-configure
     entrypoint: /bin/sh
     hostname: localhost
     command: -c "if [ ! -f /etc/teleport/teleport.yaml ]; then teleport configure > /etc/teleport/teleport.yaml; fi"
     volumes:
       - ./src/config:/etc/teleport
+    env_file: .env
 
   teleport:
     image: $W9_REPO:$W9_VERSION
-    container_name: $W9_NAME
+    container_name: $W9_ID
     entrypoint: /bin/sh
     hostname: localhost
     command: -c "sleep 1 && /usr/bin/dumb-init teleport start -c /etc/teleport/teleport.yaml"
     ports:
-      - "3023:3023"
-      - "3025:3025"
-      - '${W9_HTTP_PORT}:3080'
+      - '${W9_3023_PORT_SET}:${W9_3023_PORT}'
+      - '${W9_3025_PORT_SET}:${W9_3025_PORT}'
+      - '${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}'
     volumes:
       - ./src/config:/etc/teleport
       - teleport_data:/var/lib/teleport
     depends_on:
       - teleport-configure
+    env_file: .env
 
 networks:
   default:

diff --git a/apps/teleport/variables.json b/apps/teleport/variables.json
@@ -7,14 +7,7 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
+        "14-amd64",
         "latest"
       ]
     }

diff --git a/apps/tensorflow/.env b/apps/tensorflow/.env
@@ -1,7 +1,15 @@
 W9_VERSION=2.11.1-jupyter
-W9_HTTP_PORT=9001
+W9_ID=tensorflow
+
+W9_REPO=tensorflow/tensorflow
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8888
 W9_GUI_PORT=6006
-W9_NAME=tensorflow
+W9_HTTP_PORT_SET=9001
+W9_GUI_PORT_SET=6006
+
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_URL=appname.example.com
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/tensorflow/docker-compose.yml b/apps/tensorflow/docker-compose.yml
@@ -5,13 +5,13 @@ version: '3.8'
 
 services:
   tensorflow:
-    image: tensorflow/tensorflow:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     restart: unless-stopped
     ports:
       # tensorboard port is 6006, but you need to start it on container by yourself 
-      - '${W9_HTTP_PORT}:8888'
-      - '${W9_GUI_PORT}:6006'
+      - '${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}'
+      - '${W9_GUI_PORT_SET}:${W9_GUI_PORT}'
     env_file: .env
     volumes:
       - tensorflow:/tf/notebooks

diff --git a/apps/tensorflow/variables.json b/apps/tensorflow/variables.json
@@ -7,14 +7,7 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
+        "2.11.1-jupyter",
         "latest"
       ]
     }

diff --git a/apps/theia/.env b/apps/theia/.env
@@ -1,10 +1,18 @@
 # version tags refer to: https://registry.hub.docker.com/r/theiaide/theia
 W9_POWER_PASSWO=UGz0IARz117ssO%
 W9_VERSION=latest
-W9_HTTP_PORT=9001
 W9_CONTAINER_NAME=theia
+
+W9_REPO=theiaide/theia
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=3000
+W9_HTTP_PORT_SET=9001
+
 W9_NETWORK=websoft9
+W9_URL=appname.example.com
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
 
 VOLUMES_PATH_PREFIX=./volumes
-DOMAIN=theia.example.com
-EMAIL=[email protected]
+EMAIL=[email protected]
diff --git a/apps/theia/docker-compose.yml b/apps/theia/docker-compose.yml
@@ -4,10 +4,10 @@ version: '3.8'
 
 services:
   theia:
-    image: theiaide/theia:${W9_VERSION}
+    image: ${W9_REPO}:${W9_VERSION}
     container_name: ${W9_CONTAINER_NAME}
     ports:
-      - ${W9_HTTP_PORT}:3000
+      - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}
     volumes:
       - theia:/home/project
     restart: unless-stopped

diff --git a/apps/theia/variables.json b/apps/theia/variables.json
@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }

diff --git a/apps/thingsboard/.env b/apps/thingsboard/.env
@@ -1,15 +1,31 @@
-W9_NAME=thingsboard
+W9_ID=thingsboard
 W9_REPO=thingsboard/tb-postgres
 W9_VERSION=latest
 
-W9_HTTP_PORT=9009
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=9090
+W9_HTTP_PORT_SET=9009
+
 W9_MQTT_PORT=1883
+W9_MQTT_PORT_SET=1883
+
 W9_RPC_PORT=7070
+W9_RPC_PORT_SET=7070
+
 W9_UDP_PORT=5683-5688
-W9_KAFKA_PORT=9093
+W9_UDP_PORT_SET=5683-5688
+
+W9_KAFKA_PORT=9092
+W9_KAFKA_PORT_SET=9093
+
 W9_ZK_PORT=2181
+W9_ZK_PORT_SET=2181
+
+
 
+W9_NETWORK=websoft9
 W9_USER=[email protected]
 W9_PASSWORD=sysadmin
 
-W9_NETWORK=websoft9
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/thingsboard/docker-compose.yml b/apps/thingsboard/docker-compose.yml
@@ -7,18 +7,18 @@ version: '3.8'
 services:
   thingsboard:
     image: $W9_REPO:$W9_VERSION
-    container_name: $W9_NAME
+    container_name: $W9_ID
     restart: unless-stopped
     env_file:
       - .env
     ports:
-      - '${W9_HTTP_PORT}:9090'
-      - '${W9_MQTT_PORT}:1883'
-      - '${W9_RPC_PORT}:7070'
-      - '${W9_UDP_PORT}:5683-5688/udp'
+      - '${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}'
+      - '${W9_MQTT_PORT_SET}:${W9_MQTT_PORT}'
+      - '${W9_RPC_PORT_SET}:${W9_RPC_PORT}'
+      - '${W9_UDP_PORT_SET}:${W9_UDP_PORT}/udp'
     environment:
       TB_QUEUE_TYPE: kafka
-      TB_KAFKA_SERVERS: $W9_NAME-kafka:9092
+      TB_KAFKA_SERVERS: $W9_ID-kafka:9092
     depends_on:
       - kafka
     volumes:
@@ -28,21 +28,21 @@ services:
   zookeeper:
     restart: unless-stopped
     image: "zookeeper:3.5"
-    container_name: $W9_NAME-zookeeper
+    container_name: $W9_ID-zookeeper
     ports:
-      - "$W9_ZK_PORT:2181"
+      - "$W9_ZK_PORT_SET:$W9_ZK_PORT"
     environment:
       ZOO_MY_ID: 1
       ZOO_SERVERS: server.1=zookeeper:2888:3888;zookeeper:2181
 
   kafka:
     restart: unless-stopped
     image: wurstmeister/kafka
-    container_name: $W9_NAME-kafka
+    container_name: $W9_ID-kafka
     depends_on:
       - zookeeper
     ports:
-      - "$W9_KAFKA_PORT:9092"
+      - "$W9_KAFKA_PORT_SET:$W9_KAFKA_PORT"
     environment:
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
       KAFKA_LISTENERS: INSIDE://:9093,OUTSIDE://:9092

diff --git a/apps/thingsboard/variables.json b/apps/thingsboard/variables.json
@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }

diff --git a/apps/traefik/.env b/apps/traefik/.env
@@ -1,5 +1,13 @@
 W9_VERSION=2.7
+W9_ID=traefik
+
+W9_REPO=traefik
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
 W9_WEB_PORT=80
+W9_WEB_PORT_SET=80
 W9_DASHBOARD_PORT=8080
-W9_NAME=traefik
+W9_DASHBOARD_PORT_SET=8080
+
 W9_NETWORK=websoft9
+W9_URL_REPLACE=false
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/traefik/docker-compose.yml b/apps/traefik/docker-compose.yml
@@ -6,11 +6,11 @@ version: '3.8'
 
 services:
   traefik:
-    image: traefik:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     ports:
-      - '${W9_WEB_PORT}:80'
-      - '${W9_DASHBOARD_PORT}:8080'
+      - '${W9_WEB_PORT_SET}:${W9_WEB_PORT}'
+      - '${W9_DASHBOARD_PORT_SET}:${W9_DASHBOARD_PORT}'
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - $PWD/src/traefik.yml:/etc/traefik/traefik.yml

diff --git a/apps/traefik/variables.json b/apps/traefik/variables.json
@@ -7,14 +7,7 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
+        "2.7",
         "latest"
       ]
     }