From 063ce0e9bd4a4a7dad7034c155f4df1ab865ba49 Mon Sep 17 00:00:00 2001 From: stdevYuniers Date: Thu, 27 Dec 2018 14:13:46 -0500 Subject: [PATCH] [docker] refs #27 Move to vscode folder to build respective image --- docker/images/dev-cli/hooks/build | 41 +++++++++++++++++-------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/docker/images/dev-cli/hooks/build b/docker/images/dev-cli/hooks/build index 4eae5943..32fb7d01 100755 --- 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