Compare commits

...

11 Commits

Author SHA1 Message Date
LinuxServer-CI
e402cc2e16 Bot Updating Templated Files 2020-05-29 17:51:28 +00:00
aptalca
00afdeb441 Merge pull request #30 from n-i-x/n-i-x-patch-1
Add support for --proxy-domain
2020-05-29 13:50:10 -04:00
n-i-x
08841b0f51 Remove docker-compose vars 2020-05-29 11:50:49 -04:00
n-i-x
54d481ef55 move readme stuff into readme-vars 2020-05-29 11:38:41 -04:00
jrebey
d413b7d2a6 remove weird code-server: 2020-05-29 10:26:24 -04:00
jrebey
2edc59783f editor set to spaces not tabs :/ 2020-05-29 10:25:32 -04:00
jrebey
af00f6d309 remove golang mod PATH 2020-05-29 10:24:32 -04:00
jrebey
2b8da35c3b Merge remote-tracking branch 'upstream/master' into n-i-x-patch-1 2020-05-29 10:22:03 -04:00
n-i-x
9ae8d18bd2 Update readme-vars.yml 2020-05-19 23:16:37 -04:00
n-i-x
f2c46c0e0d Add --proxy-domain documentation 2020-05-19 23:12:42 -04:00
n-i-x
eb7eaa456a Add --proxy-domain support 2020-05-19 23:06:47 -04:00
3 changed files with 13 additions and 0 deletions

View File

@@ -82,6 +82,7 @@ docker create \
-e TZ=Europe/London \
-e PASSWORD=password `#optional` \
-e SUDO_PASSWORD=password `#optional` \
-e PROXY_DOMAIN=code-server.my.domain `#optional` \
-p 8443:8443 \
-v /path/to/appdata/config:/config \
--restart unless-stopped \
@@ -106,6 +107,7 @@ services:
- TZ=Europe/London
- PASSWORD=password #optional
- SUDO_PASSWORD=password #optional
- PROXY_DOMAIN=code-server.my.domain #optional
volumes:
- /path/to/appdata/config:/config
ports:
@@ -125,6 +127,7 @@ Container images are configured using parameters passed at runtime (such as thos
| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
| `-e PASSWORD=password` | Optional web gui password, if not provided, there will be no auth. |
| `-e SUDO_PASSWORD=password` | If this optional variable is set, user will have sudo access in the code-server terminal with the specified password. |
| `-e PROXY_DOMAIN=code-server.my.domain` | 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) |
| `-v /config` | Contains all relevant configuration files. |
## Environment variables from files (Docker secrets)
@@ -240,6 +243,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **29.05.20:** - Add --domain-proxy support.
* **21.05.20:** - Shrink images, install via yarn, fix arm32v7 build.
* **18.05.20:** - Switch to multi-arch images, install via npm.
* **29.04.20:** - Update start arguments.

View File

@@ -49,6 +49,7 @@ opt_param_usage_include_env: true
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: "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_items: ""
@@ -67,6 +68,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "29.05.20:", desc: "Add --domain-proxy support."}
- { 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: "29.04.20:", desc: "Update start arguments." }

View File

@@ -7,6 +7,12 @@ else
echo "starting with no password"
fi
if [ -z ${PROXY_DOMAIN+x} ]; then
PROXY_DOMAIN_ARG=""
else
PROXY_DOMAIN_ARG="--proxy-domain=${PROXY_DOMAIN}"
fi
exec \
s6-setuidgid abc \
/usr/bin/code-server \
@@ -15,4 +21,5 @@ exec \
--extensions-dir /config/extensions \
--disable-telemetry \
--auth "${AUTH}" \
"${PROXY_DOMAIN_ARG}" \
/config/workspace