switch cli from local to npm

devcontainers · Jul 15, 2022 · c851e6d · c851e6d
1 parent eb225a0
commit c851e6d
Show file tree

Hide file tree

Showing 56 changed files with 10 additions and 16 deletions.
diff --git a/.github/actions/smoke-test/build.sh b/.github/actions/smoke-test/build.sh
@@ -4,14 +4,8 @@ IMAGE="$1"
 set -e
 
 export DOCKER_BUILDKIT=1
-echo "(*) Pulling latest '@devcontainer/cli"
-# npm install -g @devcontainers/cli
-
-#Temporarily installing cli from source until https://github.com/devcontainers/cli/pull/6 is merged
-cd build 
-chmod +x devcontainers-cli-0.6.4.tgz
+echo "(*) Installing @devcontainer/[email protected]"
+npm install -g @devcontainers/[email protected]
 
 echo "(*) Building image - ${IMAGE}"
-npx --yes devcontainers-cli-0.6.4.tgz up --workspace-folder ../src/${IMAGE}
-# devcontainer build --workspace-folder "src/${IMAGE}/" --image-name vsc-${IMAGE}
-
+devcontainer up --workspace-folder "src/${IMAGE}/"
diff --git a/.github/actions/smoke-test/test.sh b/.github/actions/smoke-test/test.sh
@@ -6,10 +6,8 @@ set -e
 
 # Run actual test
 echo "(*) Running test..."
-cd build
-chmod +x devcontainers-cli-0.6.4.tgz
 
-npx --yes devcontainers-cli-0.6.4.tgz exec --workspace-folder $(pwd)/../src/$IMAGE /bin/sh -c 'set -e && if [ -f "test-project/test.sh" ]; then cd test-project && if [ "$(id -u)" = "0" ]; then chmod +x test.sh; else sudo chmod +x test.sh; fi && ./test.sh; else ls -a; fi'
+devcontainer exec --workspace-folder $(pwd)/src/$IMAGE /bin/sh -c 'set -e && if [ -f "test-project/test.sh" ]; then cd test-project && if [ "$(id -u)" = "0" ]; then chmod +x test.sh; else sudo chmod +x test.sh; fi && ./test.sh; else ls -a; fi'
 
 # Clean up
 docker stop $(docker container ls -q)
diff --git a/.github/workflows/push-again.yml b/.github/workflows/push-again.yml
@@ -57,6 +57,7 @@ jobs:
         # Setup build CLI
         cd "$GITHUB_WORKSPACE/ref"
         yarn install
+        npm install -g @devcontainers/[email protected]
 
         # Go to the release, symlink the build tool from ref since this is the version for the workflow
         cd "$GITHUB_WORKSPACE/release"

diff --git a/.github/workflows/push-dev.yml b/.github/workflows/push-dev.yml
@@ -47,7 +47,7 @@ jobs:
 
         # Build and push dev images
         yarn install
-        npm install -g @devcontainers/cli
+        npm install -g @devcontainers/cli@0.8.0
         GIT_BRANCH=$(echo "${{ github.ref }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
         if [ "$GIT_BRANCH" == "" ]; then 
             GIT_BRANCH=main

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -45,7 +45,7 @@ jobs:
 
         # Build and push images
         yarn install
-        npm install -g @devcontainers/cli
+        npm install -g @devcontainers/cli@0.8.0
         build/vscdc push  --page ${{ matrix.page }} \
                           --pageTotal ${{ matrix.page-total }} \
                           --release v0.0.1 \

diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-node_modules/
+node_modules/
+.tgz
diff --git a/build/devcontainers-cli-0.6.0.tgz b/build/devcontainers-cli-0.6.0.tgz
diff --git a/build/devcontainers-cli-0.6.3.tgz b/build/devcontainers-cli-0.6.3.tgz
diff --git a/build/devcontainers-cli-0.6.4.tgz b/build/devcontainers-cli-0.6.4.tgz
diff --git a/build/src/push.js b/build/src/push.js
@@ -139,7 +139,7 @@ async function pushImage(definitionId, repo, release, updateLatest,
                 }
 
                 const spawnOpts = { stdio: 'inherit', cwd: workingDir, shell: true };
-                await asyncUtils.spawn('npx --yes devcontainers-cli-0.6.4.tgz', [
+                await asyncUtils.spawn('devcontainer', [
                     'build',
                     '--workspace-folder', definitionPath,
                     '--log-level ', 'info',

diff --git a/src/alpine/devcontainers-cli-0.6.0.tgz b/src/alpine/devcontainers-cli-0.6.0.tgz
diff --git a/src/alpine/devcontainers-cli-0.6.3.tgz b/src/alpine/devcontainers-cli-0.6.3.tgz
diff --git a/src/alpine/devcontainers-cli-0.6.4.tgz b/src/alpine/devcontainers-cli-0.6.4.tgz
diff --git a/src/anaconda/devcontainers-cli-0.6.0.tgz b/src/anaconda/devcontainers-cli-0.6.0.tgz
diff --git a/src/anaconda/devcontainers-cli-0.6.3.tgz b/src/anaconda/devcontainers-cli-0.6.3.tgz
diff --git a/src/anaconda/devcontainers-cli-0.6.4.tgz b/src/anaconda/devcontainers-cli-0.6.4.tgz
diff --git a/src/codespaces/devcontainers-cli-0.6.0.tgz b/src/codespaces/devcontainers-cli-0.6.0.tgz
diff --git a/src/codespaces/devcontainers-cli-0.6.3.tgz b/src/codespaces/devcontainers-cli-0.6.3.tgz
diff --git a/src/codespaces/devcontainers-cli-0.6.4.tgz b/src/codespaces/devcontainers-cli-0.6.4.tgz
diff --git a/src/cpp/devcontainers-cli-0.6.0.tgz b/src/cpp/devcontainers-cli-0.6.0.tgz
diff --git a/src/cpp/devcontainers-cli-0.6.3.tgz b/src/cpp/devcontainers-cli-0.6.3.tgz
diff --git a/src/cpp/devcontainers-cli-0.6.4.tgz b/src/cpp/devcontainers-cli-0.6.4.tgz
diff --git a/src/cpp/test-project/test.sh b/src/cpp/test-project/test.sh
diff --git a/src/debian/devcontainers-cli-0.6.0.tgz b/src/debian/devcontainers-cli-0.6.0.tgz
diff --git a/src/debian/devcontainers-cli-0.6.3.tgz b/src/debian/devcontainers-cli-0.6.3.tgz
diff --git a/src/debian/devcontainers-cli-0.6.4.tgz b/src/debian/devcontainers-cli-0.6.4.tgz
diff --git a/src/dotnet/devcontainers-cli-0.6.0.tgz b/src/dotnet/devcontainers-cli-0.6.0.tgz
diff --git a/src/dotnet/devcontainers-cli-0.6.3.tgz b/src/dotnet/devcontainers-cli-0.6.3.tgz
diff --git a/src/dotnet/devcontainers-cli-0.6.4.tgz b/src/dotnet/devcontainers-cli-0.6.4.tgz
diff --git a/src/go/devcontainers-cli-0.6.0.tgz b/src/go/devcontainers-cli-0.6.0.tgz
diff --git a/src/go/devcontainers-cli-0.6.3.tgz b/src/go/devcontainers-cli-0.6.3.tgz
diff --git a/src/go/devcontainers-cli-0.6.4.tgz b/src/go/devcontainers-cli-0.6.4.tgz
diff --git a/src/java/devcontainers-cli-0.6.0.tgz b/src/java/devcontainers-cli-0.6.0.tgz
diff --git a/src/java/devcontainers-cli-0.6.3.tgz b/src/java/devcontainers-cli-0.6.3.tgz
diff --git a/src/java/devcontainers-cli-0.6.4.tgz b/src/java/devcontainers-cli-0.6.4.tgz
diff --git a/src/jekyll/devcontainers-cli-0.6.0.tgz b/src/jekyll/devcontainers-cli-0.6.0.tgz
diff --git a/src/jekyll/devcontainers-cli-0.6.3.tgz b/src/jekyll/devcontainers-cli-0.6.3.tgz
diff --git a/src/jekyll/devcontainers-cli-0.6.4.tgz b/src/jekyll/devcontainers-cli-0.6.4.tgz
diff --git a/src/miniconda/devcontainers-cli-0.6.0.tgz b/src/miniconda/devcontainers-cli-0.6.0.tgz
diff --git a/src/miniconda/devcontainers-cli-0.6.3.tgz b/src/miniconda/devcontainers-cli-0.6.3.tgz
diff --git a/src/miniconda/devcontainers-cli-0.6.4.tgz b/src/miniconda/devcontainers-cli-0.6.4.tgz
diff --git a/src/php/devcontainers-cli-0.6.0.tgz b/src/php/devcontainers-cli-0.6.0.tgz
diff --git a/src/php/devcontainers-cli-0.6.3.tgz b/src/php/devcontainers-cli-0.6.3.tgz
diff --git a/src/php/devcontainers-cli-0.6.4.tgz b/src/php/devcontainers-cli-0.6.4.tgz
diff --git a/src/python/devcontainers-cli-0.6.0.tgz b/src/python/devcontainers-cli-0.6.0.tgz
diff --git a/src/python/devcontainers-cli-0.6.3.tgz b/src/python/devcontainers-cli-0.6.3.tgz
diff --git a/src/python/devcontainers-cli-0.6.4.tgz b/src/python/devcontainers-cli-0.6.4.tgz
diff --git a/src/ruby/devcontainers-cli-0.6.0.tgz b/src/ruby/devcontainers-cli-0.6.0.tgz
diff --git a/src/ruby/devcontainers-cli-0.6.3.tgz b/src/ruby/devcontainers-cli-0.6.3.tgz
diff --git a/src/ruby/devcontainers-cli-0.6.4.tgz b/src/ruby/devcontainers-cli-0.6.4.tgz
diff --git a/src/rust/devcontainers-cli-0.6.0.tgz b/src/rust/devcontainers-cli-0.6.0.tgz
diff --git a/src/rust/devcontainers-cli-0.6.3.tgz b/src/rust/devcontainers-cli-0.6.3.tgz
diff --git a/src/rust/devcontainers-cli-0.6.4.tgz b/src/rust/devcontainers-cli-0.6.4.tgz
diff --git a/src/ubuntu/devcontainers-cli-0.6.0.tgz b/src/ubuntu/devcontainers-cli-0.6.0.tgz
diff --git a/src/ubuntu/devcontainers-cli-0.6.3.tgz b/src/ubuntu/devcontainers-cli-0.6.3.tgz
diff --git a/src/ubuntu/devcontainers-cli-0.6.4.tgz b/src/ubuntu/devcontainers-cli-0.6.4.tgz