Merge branch 'master' of http://140.114.135.53:8081/lab/TPM

docker-compose.yml

@@ -11,41 +11,50 @@ services:
             PGDATA: /var/lib/postgresql/data
         volumes:
             - db-data:/var/lib/postgresql/data
-#        ports:
-#            - "5432:5432"   
+        #        ports:
+        #            - "5432:5432"   
         networks:
             - common_network
-#Comment for security          
-#    pgadmin:
-#        image: dpage/pgadmin4:latest
-#        environment:
-#            PGADMIN_DEFAULT_EMAIL: jjjoey020629@gmail.com
-#            PGADMIN_DEFAULT_PASSWORD: password
-#            PGADMIN_LISTEN_PORT: 90
-#        ports:
-#            - "7070:90"
-#        volumes:
-#            - pgadmin-data:/var/lib/pgadmin
-#        links:
-#            - "db:pgsql-server"
-#        networks:
-#        - common_network            
+    #Comment for security          
+    #    pgadmin:
+    #        image: dpage/pgadmin4:latest
+    #        environment:
+    #            PGADMIN_DEFAULT_EMAIL: jjjoey020629@gmail.com
+    #            PGADMIN_DEFAULT_PASSWORD: password
+    #            PGADMIN_LISTEN_PORT: 90
+    #        ports:
+    #            - "7070:90"
+    #        volumes:
+    #            - pgadmin-data:/var/lib/pgadmin
+    #        links:
+    #            - "db:pgsql-server"
+    #        networks:
+    #        - common_network            
     redis:
         image: redis:7.0.11-alpine
         container_name: myredis
-#        ports:
-#         - 6379:6379
+        #        ports:
+        #         - 6379:6379
         volumes:
             - /data/redis-data:/data
         networks:
             - common_network
-    flask:
+    flask_init:
         build: ./
+        image: tpm-flask
+        volumes:
+            - flask-data:/flask_run
+        command: bash -c "cp -r /flask/* /flask_run"
+    flask:
         container_name: flask
-        command: bash -c "python main.py runserver 0.0.0.0:8000"
+        command: bash -c "cd flask_run; python main.py runserver 0.0.0.0:8000"
+        image: tpm-flask
+        volumes:
+            - flask-data:/flask_run
         depends_on:
             - db
             - redis
+            - flask_init
         ports:
             - 8007:8000
         links:
@@ -67,7 +76,6 @@ services:
             - common_network
 volumes:
     db-data:
-#    pgadmin-data:
+    flask-data: #    pgadmin-data:
 networks:
-  common_network:
-#    name: common_network
+    common_network: #    name: common_network