diff --git a/deno/configurations/1.31.3.json b/deno/configurations/1.31.3.json deleted file mode 100644 index bf441d9..0000000 --- a/deno/configurations/1.31.3.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "deno_version": "v1.31.3" -} \ No newline at end of file diff --git a/deno/configurations/1.32.5.json b/deno/configurations/1.32.5.json deleted file mode 100644 index d338b30..0000000 --- a/deno/configurations/1.32.5.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "deno_version": "v1.32.5" -} \ No newline at end of file diff --git a/deno/configurations/1.33.2.json b/deno/configurations/1.33.2.json deleted file mode 100644 index ba04bd2..0000000 --- a/deno/configurations/1.33.2.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "deno_version": "v1.33.2" -} \ No newline at end of file diff --git a/deno/configurations/1.41.2.json b/deno/configurations/1.41.2.json new file mode 100644 index 0000000..cb4a0df --- /dev/null +++ b/deno/configurations/1.41.2.json @@ -0,0 +1,3 @@ +{ + "deno_version": "v1.41.2" +} \ No newline at end of file diff --git a/deno/scripts/deno-install.sh b/deno/scripts/deno-install.sh deleted file mode 100755 index 65a6fa6..0000000 --- a/deno/scripts/deno-install.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# Source: https://gist.github.com/LukeChannings/09d53f5c364391042186518c8598b85e#file-deno_install-sh -# A modification of the standard Deno installation script (https://deno.land/install.sh) -# updated to support downloading a Linux arm64 binary from LukeChannings/deno-arm64 - -set -e - -if ! command -v unzip >/dev/null; then - echo "Error: unzip is required to install Deno (see: https://github.com/denoland/deno_install#unzip-is-required)." 1>&2 - exit 1 -fi - -repo="denoland/deno" - -if [ "$OS" = "Windows_NT" ]; then - target="x86_64-pc-windows-msvc" -else - case $(uname -sm) in - "Darwin x86_64") target="x86_64-apple-darwin" ;; - "Darwin arm64") target="aarch64-apple-darwin" ;; - "Linux aarch64") - repo="LukeChannings/deno-arm64" - target="linux-arm64" - ;; - "Linux armhf") - echo "32-bit ARM is not supported. Please check your hardware and install a 64-bit operating system." - exit 1 - ;; - *) target="x86_64-unknown-linux-gnu" ;; - esac -fi - -if [ $# -eq 0 ]; then - deno_uri="https://github.com/${repo}/releases/latest/download/deno-${target}.zip" -else - deno_uri="https://github.com/${repo}/releases/download/${1}/deno-${target}.zip" -fi - -deno_install="${DENO_INSTALL:-$HOME/.deno}" -bin_dir="$deno_install/bin" -exe="$bin_dir/deno" - -if [ ! -d "$bin_dir" ]; then - mkdir -p "$bin_dir" -fi - -curl --fail --location --progress-bar --output "$exe.zip" "$deno_uri" -unzip -d "$bin_dir" -o "$exe.zip" -chmod +x "$exe" -rm "$exe.zip" - -echo "Deno was installed successfully to $exe" -if command -v deno >/dev/null; then - echo "Run 'deno --help' to get started" -else - case $SHELL in - /bin/zsh) shell_profile=".zshrc" ;; - *) shell_profile=".bashrc" ;; - esac - echo "Manually add the directory to your \$HOME/$shell_profile (or similar)" - echo " export DENO_INSTALL=\"$deno_install\"" - echo " export PATH=\"\$DENO_INSTALL/bin:\$PATH\"" - echo "Run '$exe --help' to get started" -fi \ No newline at end of file diff --git a/deno/templates/Dockerfile b/deno/templates/Dockerfile index ad271ce..3e47e88 100644 --- a/deno/templates/Dockerfile +++ b/deno/templates/Dockerfile @@ -1,9 +1,7 @@ -FROM mcr.microsoft.com/devcontainers/base:jammy +FROM mcr.microsoft.com/devcontainers/base:ubuntu ARG deno_version -# Install Deno with support for ARM64 -COPY deno/scripts/deno-install.sh /tmp/deno-install.sh -RUN /tmp/deno-install.sh ${deno_version} +RUN curl -fsSL https://deno.land/install.sh | sh -s ${deno_version} # Preinstall Code Server for user 'vscode' to speed up first run COPY scripts/install-vs-code-server.sh /tmp/install-vs-code-server.sh