update web docker config

.dockerignore

@@ -1,2 +1,6 @@
-node_modules/
+.git/
-.git/
+node_modules
+/web
+docker/
+db/
+bin/

web/config/config.js

@@ -103,9 +103,9 @@ export default {
   // extra configuration for egg
   runtimePublicPath: true,
   hash: true,
-  outputPath: '../public',
+  outputPath: '../.public',
   manifest: {
-    fileName: '../public/manifest.json',
+    fileName: '../.public/manifest.json',
     publicPath: '',
   },
 

web/docker/docker-compose-mysql.dev.yml

@@ -1,12 +0,0 @@
-version: '3'
-
-services:
-  infini-logging-db:
-    image: mariadb:10.1.19
-    # volumes: 
-    #   - ../data/db_data:/var/lib/mysql
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: admin
-    ports:
-      - "3306:3306"

web/docker/docker-compose.build.yml

@@ -6,9 +6,9 @@ services:
     image: docker.infini.ltd:64443/nodejs-dev:latest
 
     # option 2: build image locally
-    # build: 
+#    build:
-    #   context: ../
+#       context: ../
-    #   dockerfile: docker/Dockerfile
+#       dockerfile: docker/Dockerfile
       
     container_name: "infini-nodejs-build"
     volumes:
@@ -16,7 +16,7 @@ services:
       - ../config:/usr/src/app/config
       - ../mock:/usr/src/app/mock
       - ../package.json:/usr/src/app/package.json
-      - ../../public:/usr/src/public
+      - ../../.public:/usr/src/.public
       - ./entrypoint-build.sh:/entrypoint.sh
 
 volumes:

web/docker/entrypoint-build.sh

@@ -1,16 +1,10 @@
 #!/bin/sh
 
-lockPath="/tmp/init.lock"
-
 npm config set registry http://registry.npm.taobao.org/;
 
 cd /usr/src/app
 
 echo "START TO RELEASE INFINI-LOGGING-CENTER"
 
-if [ ! -f "$lockPath" ]; then
+npm install --registry=https://registry.npm.taobao.org
-  npm install --registry=https://registry.npm.taobao.org
+npm run build
-  npm run build
-else
-  npm run build
-fi