Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Dockerfile timezone, Update readme. #2666

Merged
merged 2 commits into from
Mar 20, 2020
Merged

Add Dockerfile timezone, Update readme. #2666

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6ddbbe
Add Dockerfile timezone, Update readme.
Mar 20, 2020
57e0c9f
Update Dockerfile set default timezone to UTC.
Mar 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add Dockerfile timezone, Update readme.
  • Loading branch information
mmx committed Mar 20, 2020
commit b6ddbbe0b08d20df113dcc0d1cf3c4277d33b39e
2 changes: 2 additions & 0 deletions docker/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ENV PASSWORD=
ENV METHOD aes-256-gcm
ENV TIMEOUT 300
ENV DNS_ADDRS 8.8.8.8,8.8.4.4
ENV TZ Asia/Shanghai
ENV ARGS=

COPY . /tmp/repo
Expand Down Expand Up @@ -39,6 +40,7 @@ RUN set -ex \
&& apk add --no-cache \
ca-certificates \
rng-tools \
tzdata \
$(scanelf --needed --nobanner /usr/bin/ss-* \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u) \
Expand Down
1 change: 1 addition & 0 deletions docker/alpine/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Besides `PASSWORD`, the image also defines the following environment variables t
* `METHOD`: encryption method to use, defaults to `aes-256-gcm`
* `TIMEOUT`: defaults to `300`
* `DNS_ADDRS`: DNS servers to redirect NS lookup requests to, defaults to `8.8.8.8,8.8.4.4`
* `TZ`: Timezone, defaults to `Asia/Shanghai`
madeye marked this conversation as resolved.
Show resolved Hide resolved

Additional arguments supported by `ss-server` can be passed with the environment variable `ARGS`, for instance to start in verbose mode:
```bash
Expand Down