fix bug

LomotHo · Jul 21, 2020 · 6c9e0b0 · 6c9e0b0
1 parent 203ef56
commit 6c9e0b0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -17,5 +17,6 @@ jobs:
     - name: upload image
       run: |
         docker login --username=${{ secrets.DOCKER_ID }} --password=${{ secrets.DOCKER_TOKEN }}
-        docker tag lomot/bedrock-web-console:latest lomot/bedrock-web-console:base
-        docker push lomot/bedrock-web-console:base
+        # docker push lomot/bedrock-web-console:latest
+        docker tag lomot/bedrock-web-console:latest lomot/bedrock-web-console:dev
+        docker push lomot/bedrock-web-console:dev
diff --git a/.gitignore b/.gitignore
@@ -33,5 +33,5 @@ Thumbs.db
 # Folders to ignore
 bower_components
 node_modules
-
+console.js
 # python
diff --git a/Dockerfile b/Dockerfile
@@ -32,4 +32,6 @@ COPY --from=builder /vue-dist $PUBLIC_PATH
 
 EXPOSE 3000
 # RUN 
+
+ENTRYPOINT ["script/entrypoint.sh"]
 CMD ["node","app.js"]
diff --git a/controller/api.js b/controller/api.js
@@ -11,7 +11,7 @@ module.exports = {
       });
     }
     else {
-      throw new APIError("syntax", "cmd not found");
+      throw new APIError("syntax", "cmd empty");
     }
   }
 }
diff --git a/script/entrypoint.sh b/script/entrypoint.sh
@@ -0,0 +1,6 @@
+	#!/bin/sh
+set -e
+
+echo "ENTRYPOINT"
+chmod +x bedrock/bedrock_server
+exec "$@"
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ module.exports = { @@
           });
         }
         else {
-          throw new APIError("syntax", "cmd not found");
+          throw new APIError("syntax", "cmd empty");
         }
       }
     }