Merge pull request #156 from FlowCI/develop

Develop

Author: gy2006

.gitignore

@@ -7,4 +7,3 @@ coverage
 .yarn-cache
 deploy.sh
 .vscode/
-.run/

.run/start.run.xml

@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="start" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start" />
+    </scripts>
+    <node-interpreter value="project" />
+    <package-manager value="npm" />
+    <envs>
+      <env name="VUE_APP_API_URL" value="http://192.168.31.173:8080" />
+    </envs>
+    <method v="2" />
+  </configuration>
+</component>

Makefile

@@ -8,7 +8,7 @@ CURRENT_DIR 	:= $(shell pwd)
 DOCKER_VOLUME	:= -v $(CURRENT_DIR):/ws
 DOCKER_IMG		:= node:14
 DOCKER_RUN 		:= docker run -it --rm -w /ws $(DOCKER_VOLUME) --network host $(DOCKER_IMG)
-DOCKER_BUILD	:= docker build -f ./Dockerfile -t flowci/web:latest -t flowci/web:$(tag) .
+DOCKER_BUILD	:= docker buildx build -f ./Dockerfile --platform linux/arm64,linux/amd64 --push -t flowci/web:latest -t flowci/web:$(tag) .
 
 .PHONY: build clean image