diff --git a/docker/development/scripts/2-initialise.sh b/docker/development/scripts/2-initialise.sh index 2c5129c..e9d9618 100644 --- a/docker/development/scripts/2-initialise.sh +++ b/docker/development/scripts/2-initialise.sh @@ -54,19 +54,19 @@ fi # run the dev processes in tmux and the 'main' process as the initialisation. -# vscode server -echo "-- starting openvscode server in tmux as subprocess. Use 'tmux a -t openvscode-server' to see logs. ctrl+b -> d to disconnect --" -if [ "$USE_CONNECTION_TOKEN" = "false" ] -then - tmux new-session -s "openvscode-server" -d '/opt/openvscode-server/bin/openvscode-server --port 8081 --without-connection-token; bash -i' -else - tmux new-session -s "openvscode-server" -d "/opt/openvscode-server/bin/openvscode-server --port 8081 --connection-token=${CONNECTION_TOKEN}; bash -i" -fi +# caddy +echo "-- starting caddy in tmux as subprocess. Use 'tmux a -t caddy' to see logs. ctrl+b -> d to disconnect --" +tmux new-session -s "caddy" -d 'caddy run --adapter caddyfile --config /staging/configurations/Caddyfile; bash -i' # pocketbase echo "-- starting pocketbase server in tmux as subprocess. Use 'tmux a -t pocketbase' to see logs. ctrl+b -> d to disconnect --" tmux new-session -s "pocketbase" -d 'pocketbase serve --http=0.0.0.0:8082; bash -i' -# caddy, this is our "main" process -echo "-- starting caddy reverse proxy --" -caddy run --adapter caddyfile --config /staging/configurations/Caddyfile \ No newline at end of file +# openvscodeserver, this is our "main" process. Note that caddy is the primary port (8080), not openvscode server (8081) +# if $USE_CONNECTION_TOKEN, the token will be printed in the +if [ "$USE_CONNECTION_TOKEN" = "false" ] +then + /opt/openvscode-server/bin/openvscode-server --port 8081 --without-connection-token +else + /opt/openvscode-server/bin/openvscode-server --port 8081 --connection-token=${CONNECTION_TOKEN} +fi \ No newline at end of file diff --git a/docker/development/scripts/install-openvscode-server.sh b/docker/development/scripts/install-openvscode-server.sh index 5c23b3d..8851a43 100644 --- a/docker/development/scripts/install-openvscode-server.sh +++ b/docker/development/scripts/install-openvscode-server.sh @@ -1,5 +1,5 @@ # script variables -OPENVSCODE_VERSION="1.103.1" +OPENVSCODE_VERSION="1.105.1" OPENVSCODE_URL="https://github.com/gitpod-io/openvscode-server/releases/download/openvscode-server-v$OPENVSCODE_VERSION/openvscode-server-v$OPENVSCODE_VERSION-linux-x64.tar.gz" OPENVSCODE_RELEASE="openvscode-server-v$OPENVSCODE_VERSION-linux-x64" diff --git a/docker/development/scripts/install-pocketbase.sh b/docker/development/scripts/install-pocketbase.sh index b09637b..2a49cf2 100644 --- a/docker/development/scripts/install-pocketbase.sh +++ b/docker/development/scripts/install-pocketbase.sh @@ -1,5 +1,5 @@ # script variables -PB_VERSION=0.29.3 +PB_VERSION=0.33.0 PB_URL=https://github.com/pocketbase/pocketbase/releases/download/v${PB_VERSION}/pocketbase_${PB_VERSION}_linux_amd64.zip PB_RELEASE="pocketbase_${PB_VERSION}_linux_amd64.zip"