diff --git a/README.md b/README.md index 9041e0b..4b4c5f8 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ This image provides various versions that are available via tags. `latest` tag u ## Application Setup -Access the webui at `http://:3000?tkn=supersecrettoken`. If `CONNECTION_TOKEN` or `CONNECTION_SECRET` env vars are set, replace `supersecrettoken` with the value set. If not, view the container logs (`docker logs openvscode-server`) to see the randomly generated token and replace `supersecrettoken` with that. +If `CONNECTION_TOKEN` or `CONNECTION_SECRET` env vars are set, you can access the webui at `http://:3000/?tkn=supersecrettoken` (replace `supersecrettoken` with the value set). If not, you can access the webui at `http://:3000`. For github integration, drop your ssh key in to `/config/.ssh`. Then open a terminal from the top menu and set your github username and email via the following commands @@ -252,7 +252,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **04.02.22:** - Update binary for 1.64.0. +* **04.02.22:** - Update binary for 1.64.0+. Allow for no token set when both toekn env vars are unset. * **29.12.21:** - Add `install-extension` as a helper for mods to install extensions. * **10.12.21:** - Update deprecated connectionToken arg. * **30.11.21:** - Fix app folder permissions, add the optional sudo password vars. diff --git a/readme-vars.yml b/readme-vars.yml index 13a0d80..22cca5c 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,7 +46,7 @@ optional_block_1_items: "" # application setup block app_setup_block_enabled: true app_setup_block: | - Access the webui at `http://:3000?tkn=supersecrettoken`. If `CONNECTION_TOKEN` or `CONNECTION_SECRET` env vars are set, replace `supersecrettoken` with the value set. If not, view the container logs (`docker logs openvscode-server`) to see the randomly generated token and replace `supersecrettoken` with that. + If `CONNECTION_TOKEN` or `CONNECTION_SECRET` env vars are set, you can access the webui at `http://:3000/?tkn=supersecrettoken` (replace `supersecrettoken` with the value set). If not, you can access the webui at `http://:3000`. For github integration, drop your ssh key in to `/config/.ssh`. Then open a terminal from the top menu and set your github username and email via the following commands @@ -61,7 +61,7 @@ app_setup_block: | # changelog changelogs: - - { date: "04.02.22:", desc: "Update binary for 1.64.0." } + - { date: "04.02.22:", desc: "Update binary for 1.64.0+. Allow for no token set when both toekn env vars are unset." } - { date: "29.12.21:", desc: "Add `install-extension` as a helper for mods to install extensions." } - { date: "10.12.21:", desc: "Update deprecated connectionToken arg." } - { date: "30.11.21:", desc: "Fix app folder permissions, add the optional sudo password vars." } diff --git a/root/etc/services.d/openvscode-server/run b/root/etc/services.d/openvscode-server/run index 2d6d3a8..7ccbe3b 100644 --- a/root/etc/services.d/openvscode-server/run +++ b/root/etc/services.d/openvscode-server/run @@ -7,12 +7,8 @@ elif [ -n "$CONNECTION_TOKEN" ]; then CODE_ARGS="${CODE_ARGS} --connection-token ${CONNECTION_TOKEN}" echo "Using connection token ${CONNECTION_TOKEN}" else - if [ ! -f "/config/.secretkey" ]; then - echo "Generating random secret key. . ." - echo $RANDOM | md5sum | head -c 20 > /config/.secretkey - fi - CODE_ARGS="${CODE_ARGS} --connection-token $(cat /config/.secretkey)" - echo "**** Using connection token $(cat /config/.secretkey) ****" + CODE_ARGS="${CODE_ARGS} --without-connection-token" + echo "**** No connection token is set ****" fi cd /app/openvscode-server || exit @@ -20,6 +16,7 @@ cd /app/openvscode-server || exit exec \ s6-setuidgid abc \ /app/openvscode-server/bin/openvscode-server \ + --host 0.0.0.0 \ --port 3000 \ --disable-telemetry \ ${CODE_ARGS}