[docker] refs #27 Move to vscode folder to build respective image

fibercrypto · Dec 27, 2018 · 063ce0e · 063ce0e
1 parent 8a815ea
commit 063ce0e
Showing 1 changed file with 22 additions and 19 deletions.
diff --git a/docker/images/dev-cli/hooks/build b/docker/images/dev-cli/hooks/build
@@ -28,23 +28,26 @@ docker build --build-arg BDATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 # Build :dind, :vscode and :vscode-dind tag
 # Only build if docker tag is develop
 if [ "$CACHE_TAG" == "develop" ]; then
-  docker build --build-arg IMAGE_FROM="skycoin/skycoindev-cli:dind" \
-               --build-arg BDATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-               --build-arg SCOMMIT=$SOURCE_COMMIT \
-               -f $DOCKERFILE_PATH \
-               -t "$DOCKER_REPO:dind" .
-
-  docker build --build-arg IMAGE_FROM="$IMAGE_NAME" \
-               --build-arg BDATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-               --build-arg SCOMMIT=$SOURCE_COMMIT \
-               --build-arg VS_EXTENSIONS="ms-vscode.csharp Leopotam.csharpfixformat jchannon.csharpextensions k--kato.docomment formulahendry.dotnet" \
-               -f gopath/src/github.com/skycoin/skycoin/docker/images/dev-vscode/Dockerfile \
-               -t "$DOCKER_REPO:vscode" .
-
-  docker build --build-arg IMAGE_FROM="$DOCKER_REPO:dind" \
-               --build-arg BDATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-               --build-arg SCOMMIT=$SOURCE_COMMIT \
-               --build-arg VS_EXTENSIONS="ms-vscode.csharp Leopotam.csharpfixformat jchannon.csharpextensions k--kato.docomment formulahendry.dotnet" \
-               -f gopath/src/github.com/skycoin/skycoin/docker/images/dev-vscode/Dockerfile \
-               -t "$DOCKER_REPO:vscode-dind" .
+    docker build --build-arg IMAGE_FROM="skycoin/skycoindev-cli:dind" \
+                --build-arg BDATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+                --build-arg SCOMMIT=$SOURCE_COMMIT \
+                -f $DOCKERFILE_PATH \
+                -t "$DOCKER_REPO:dind" .
+
+    # Move to vscode folder to avoid file errors with vscode docker image
+    cd gopath/src/github.com/skycoin/skycoin/docker/images/dev-vscode/
+
+    docker build --build-arg IMAGE_FROM="$IMAGE_NAME" \
+                --build-arg BDATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+                --build-arg SCOMMIT=$SOURCE_COMMIT \
+                --build-arg VS_EXTENSIONS="ms-vscode.csharp Leopotam.csharpfixformat jchannon.csharpextensions k--kato.docomment formulahendry.dotnet" \
+                -f Dockerfile \
+                -t "$DOCKER_REPO:vscode" .
+
+    docker build --build-arg IMAGE_FROM="$DOCKER_REPO:dind" \
+                --build-arg BDATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+                --build-arg SCOMMIT=$SOURCE_COMMIT \
+                --build-arg VS_EXTENSIONS="ms-vscode.csharp Leopotam.csharpfixformat jchannon.csharpextensions k--kato.docomment formulahendry.dotnet" \
+                -f Dockerfile \
+                -t "$DOCKER_REPO:vscode-dind" .
 fi