diff --git a/.github/actions/smoke-test/build.sh b/.github/actions/smoke-test/build.sh index 4b985ce60..1a9ab5548 100755 --- 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/cli@0.8.0" +npm install -g @devcontainers/cli@0.8.0 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 index f508a537b..1a230db36 100755 --- 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 index 4fd4a7667..f2609ea9f 100644 --- 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/cli@0.8.0 # 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 index 08533ef6d..a7cab25e0 100644 --- 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 index bf8b07de9..b8df6fd36 100644 --- 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 index 40b878db5..0d4e0dac1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -node_modules/ \ No newline at end of file +node_modules/ +.tgz diff --git a/build/devcontainers-cli-0.6.0.tgz b/build/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/build/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/build/devcontainers-cli-0.6.3.tgz b/build/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/build/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/build/devcontainers-cli-0.6.4.tgz b/build/devcontainers-cli-0.6.4.tgz deleted file mode 100755 index c67f62235..000000000 Binary files a/build/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/build/src/push.js b/build/src/push.js index 77218e138..e2e1b5d49 100644 --- 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 deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/alpine/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/alpine/devcontainers-cli-0.6.3.tgz b/src/alpine/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/alpine/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/alpine/devcontainers-cli-0.6.4.tgz b/src/alpine/devcontainers-cli-0.6.4.tgz deleted file mode 100644 index c67f62235..000000000 Binary files a/src/alpine/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/anaconda/devcontainers-cli-0.6.0.tgz b/src/anaconda/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/anaconda/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/anaconda/devcontainers-cli-0.6.3.tgz b/src/anaconda/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/anaconda/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/anaconda/devcontainers-cli-0.6.4.tgz b/src/anaconda/devcontainers-cli-0.6.4.tgz deleted file mode 100644 index c67f62235..000000000 Binary files a/src/anaconda/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/codespaces/devcontainers-cli-0.6.0.tgz b/src/codespaces/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/codespaces/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/codespaces/devcontainers-cli-0.6.3.tgz b/src/codespaces/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/codespaces/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/codespaces/devcontainers-cli-0.6.4.tgz b/src/codespaces/devcontainers-cli-0.6.4.tgz deleted file mode 100644 index c67f62235..000000000 Binary files a/src/codespaces/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/cpp/devcontainers-cli-0.6.0.tgz b/src/cpp/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/cpp/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/cpp/devcontainers-cli-0.6.3.tgz b/src/cpp/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/cpp/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/cpp/devcontainers-cli-0.6.4.tgz b/src/cpp/devcontainers-cli-0.6.4.tgz deleted file mode 100644 index c67f62235..000000000 Binary files a/src/cpp/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/cpp/test-project/test.sh b/src/cpp/test-project/test.sh old mode 100644 new mode 100755 diff --git a/src/debian/devcontainers-cli-0.6.0.tgz b/src/debian/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/debian/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/debian/devcontainers-cli-0.6.3.tgz b/src/debian/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/debian/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/debian/devcontainers-cli-0.6.4.tgz b/src/debian/devcontainers-cli-0.6.4.tgz deleted file mode 100644 index c67f62235..000000000 Binary files a/src/debian/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/dotnet/devcontainers-cli-0.6.0.tgz b/src/dotnet/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/dotnet/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/dotnet/devcontainers-cli-0.6.3.tgz b/src/dotnet/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/dotnet/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/dotnet/devcontainers-cli-0.6.4.tgz b/src/dotnet/devcontainers-cli-0.6.4.tgz deleted file mode 100644 index c67f62235..000000000 Binary files a/src/dotnet/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/go/devcontainers-cli-0.6.0.tgz b/src/go/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/go/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/go/devcontainers-cli-0.6.3.tgz b/src/go/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/go/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/go/devcontainers-cli-0.6.4.tgz b/src/go/devcontainers-cli-0.6.4.tgz deleted file mode 100644 index c67f62235..000000000 Binary files a/src/go/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/java/devcontainers-cli-0.6.0.tgz b/src/java/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/java/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/java/devcontainers-cli-0.6.3.tgz b/src/java/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/java/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/java/devcontainers-cli-0.6.4.tgz b/src/java/devcontainers-cli-0.6.4.tgz deleted file mode 100644 index c67f62235..000000000 Binary files a/src/java/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/jekyll/devcontainers-cli-0.6.0.tgz b/src/jekyll/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/jekyll/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/jekyll/devcontainers-cli-0.6.3.tgz b/src/jekyll/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/jekyll/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/jekyll/devcontainers-cli-0.6.4.tgz b/src/jekyll/devcontainers-cli-0.6.4.tgz deleted file mode 100755 index c67f62235..000000000 Binary files a/src/jekyll/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/miniconda/devcontainers-cli-0.6.0.tgz b/src/miniconda/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/miniconda/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/miniconda/devcontainers-cli-0.6.3.tgz b/src/miniconda/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/miniconda/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/miniconda/devcontainers-cli-0.6.4.tgz b/src/miniconda/devcontainers-cli-0.6.4.tgz deleted file mode 100755 index c67f62235..000000000 Binary files a/src/miniconda/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/php/devcontainers-cli-0.6.0.tgz b/src/php/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/php/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/php/devcontainers-cli-0.6.3.tgz b/src/php/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/php/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/php/devcontainers-cli-0.6.4.tgz b/src/php/devcontainers-cli-0.6.4.tgz deleted file mode 100755 index c67f62235..000000000 Binary files a/src/php/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/python/devcontainers-cli-0.6.0.tgz b/src/python/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/python/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/python/devcontainers-cli-0.6.3.tgz b/src/python/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/python/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/python/devcontainers-cli-0.6.4.tgz b/src/python/devcontainers-cli-0.6.4.tgz deleted file mode 100755 index c67f62235..000000000 Binary files a/src/python/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/ruby/devcontainers-cli-0.6.0.tgz b/src/ruby/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/ruby/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/ruby/devcontainers-cli-0.6.3.tgz b/src/ruby/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/ruby/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/ruby/devcontainers-cli-0.6.4.tgz b/src/ruby/devcontainers-cli-0.6.4.tgz deleted file mode 100755 index c67f62235..000000000 Binary files a/src/ruby/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/rust/devcontainers-cli-0.6.0.tgz b/src/rust/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/rust/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/rust/devcontainers-cli-0.6.3.tgz b/src/rust/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/rust/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/rust/devcontainers-cli-0.6.4.tgz b/src/rust/devcontainers-cli-0.6.4.tgz deleted file mode 100755 index c67f62235..000000000 Binary files a/src/rust/devcontainers-cli-0.6.4.tgz and /dev/null differ diff --git a/src/ubuntu/devcontainers-cli-0.6.0.tgz b/src/ubuntu/devcontainers-cli-0.6.0.tgz deleted file mode 100644 index 8e95c7ba2..000000000 Binary files a/src/ubuntu/devcontainers-cli-0.6.0.tgz and /dev/null differ diff --git a/src/ubuntu/devcontainers-cli-0.6.3.tgz b/src/ubuntu/devcontainers-cli-0.6.3.tgz deleted file mode 100644 index 960104624..000000000 Binary files a/src/ubuntu/devcontainers-cli-0.6.3.tgz and /dev/null differ diff --git a/src/ubuntu/devcontainers-cli-0.6.4.tgz b/src/ubuntu/devcontainers-cli-0.6.4.tgz deleted file mode 100755 index c67f62235..000000000 Binary files a/src/ubuntu/devcontainers-cli-0.6.4.tgz and /dev/null differ