Skip to content
Snippets Groups Projects
Unverified Commit 00afdeb4 authored by aptalca's avatar aptalca Committed by GitHub
Browse files

Merge pull request #30 from n-i-x/n-i-x-patch-1

Add support for --proxy-domain
parents b456c30f 08841b0f
No related branches found
No related tags found
No related merge requests found
...@@ -49,6 +49,7 @@ opt_param_usage_include_env: true ...@@ -49,6 +49,7 @@ opt_param_usage_include_env: true
opt_param_env_vars: opt_param_env_vars:
- { env_var: "PASSWORD", env_value: "password", desc: "Optional web gui password, if not provided, there will be no auth."} - { env_var: "PASSWORD", env_value: "password", desc: "Optional web gui password, if not provided, there will be no auth."}
- { env_var: "SUDO_PASSWORD", env_value: "password", desc: "If this optional variable is set, user will have sudo access in the code-server terminal with the specified password."} - { env_var: "SUDO_PASSWORD", env_value: "password", desc: "If this optional variable is set, user will have sudo access in the code-server terminal with the specified password."}
- { env_var: "PROXY_DOMAIN", env_value: "code-server.my.domain", desc: "If this optional variable is set, this domain will be proxied for subdomain proxying. See [Documentation](https://github.com/cdr/code-server/blob/master/doc/FAQ.md#sub-domains)" }
optional_block_1: false optional_block_1: false
optional_block_1_items: "" optional_block_1_items: ""
...@@ -67,6 +68,7 @@ app_setup_block: | ...@@ -67,6 +68,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "29.05.20:", desc: "Add --domain-proxy support."}
- { date: "21.05.20:", desc: "Shrink images, install via yarn, fix arm32v7 build." } - { date: "21.05.20:", desc: "Shrink images, install via yarn, fix arm32v7 build." }
- { date: "18.05.20:", desc: "Switch to multi-arch images, install via npm." } - { date: "18.05.20:", desc: "Switch to multi-arch images, install via npm." }
- { date: "29.04.20:", desc: "Update start arguments." } - { date: "29.04.20:", desc: "Update start arguments." }
......
...@@ -7,6 +7,12 @@ else ...@@ -7,6 +7,12 @@ else
echo "starting with no password" echo "starting with no password"
fi fi
if [ -z ${PROXY_DOMAIN+x} ]; then
PROXY_DOMAIN_ARG=""
else
PROXY_DOMAIN_ARG="--proxy-domain=${PROXY_DOMAIN}"
fi
exec \ exec \
s6-setuidgid abc \ s6-setuidgid abc \
/usr/bin/code-server \ /usr/bin/code-server \
...@@ -15,4 +21,5 @@ exec \ ...@@ -15,4 +21,5 @@ exec \
--extensions-dir /config/extensions \ --extensions-dir /config/extensions \
--disable-telemetry \ --disable-telemetry \
--auth "${AUTH}" \ --auth "${AUTH}" \
"${PROXY_DOMAIN_ARG}" \
/config/workspace /config/workspace
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment