From 2521d2531af91dbcbe7f4b303f1823a6fc536779 Mon Sep 17 00:00:00 2001 From: "Quentin McGaw (desktop)" Date: Sat, 11 Jan 2020 20:18:14 +0000 Subject: [PATCH] Added env variables, fixes #1 --- Dockerfile | 15 +++++++++++++++ README.md | 22 +++++++++++++++++++--- docker-compose.yml | 12 ++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 70c18e0..4471e71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,6 +41,21 @@ EXPOSE 8000 HEALTHCHECK --start-period=1s --interval=100s --timeout=2s --retries=1 CMD ["/server","healthcheck"] USER 1000 ENTRYPOINT ["/server"] +ENV \ + LISTENING_PORT=8000 \ + ROOT_URL=/ \ + NODE_ENV=production \ + PANDOC_PATH=pandoc \ + WKHTMLTOPDF_PATH=wkhtmltopdf \ + USER_BUCKET_NAME=stackedit-users \ + PAYPAL_RECEIVER_EMAIL= \ + DROPBOX_APP_KEY= \ + DROPBOX_APP_KEY_FULL= \ + GITHUB_CLIENT_ID= \ + GITHUB_CLIENT_SECRET= \ + GOOGLE_CLIENT_ID= \ + GOOGLE_API_KEY= \ + WORDPRESS_CLIENT_ID= COPY --from=stackedit --chown=1000 /stackedit/dist /html/dist COPY --from=stackedit --chown=1000 /stackedit/static /html/static COPY --from=server --chown=1000 /tmp/gobuild/app /server diff --git a/README.md b/README.md index ffd1529..6ddbcad 100644 --- a/README.md +++ b/README.md @@ -62,8 +62,22 @@ ## Environment variables -- `LISTENING_PORT` to change the internal HTTP server listening port if you need to -- `ROOT_URL` to define a root URL (i.e. `/mypath`) if you use a reverse proxy such as Nginx +| Environment variable | Default | Description | +| --- | --- | --- | +| `LISTENING_PORT` | `8000` | Internal server listening port | +| `ROOT_URL` | `/` | Root URL to use, useful when used with a reverse proxy | +| `NODE_ENV` | `production` | Sets production behavior for stackedit | +| `PANDOC_PATH` | `pandoc` | *Non functional yet* | +| `WKHTMLTOPDF_PATH` | `wkhtmltopdf` | *Non functional yet* | +| `USER_BUCKET_NAME` | `stackedit-users` | ? | +| `PAYPAL_RECEIVER_EMAIL` | | Receive Paypal donation email address | +| `DROPBOX_APP_KEY` | | | +| `DROPBOX_APP_KEY_FULL` | | | +| `GITHUB_CLIENT_ID` | | | +| `GITHUB_CLIENT_SECRET` | | | +| `GOOGLE_CLIENT_ID` | | | +| `GOOGLE_API_KEY` | | | +| `WORDPRESS_CLIENT_ID` | | | ## Acknowledgements @@ -71,5 +85,7 @@ Credits to the [developers](https://github.com/benweet/stackedit/graphs/contribu ## TODOs -- [ ] Configuration of Stackedit with env variables +- [ ] Add static binary programs + - [ ] pandoc + - [ ] wkhtmltopdf - [ ] Travis CI build cross CPU arch diff --git a/docker-compose.yml b/docker-compose.yml index fe9bc64..08ddbf1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,18 @@ services: stackedit: image: qmcgaw/stackedit container_name: stackedit + environment: + - LISTENING_PORT=8000 + - ROOT_URL=/ + - USER_BUCKET_NAME=stackedit-users + - PAYPAL_RECEIVER_EMAIL= + - DROPBOX_APP_KEY= + - DROPBOX_APP_KEY_FULL= + - GITHUB_CLIENT_ID= + - GITHUB_CLIENT_SECRET= + - GOOGLE_CLIENT_ID= + - GOOGLE_API_KEY= + - WORDPRESS_CLIENT_ID= ports: - 8000:8000/tcp network_mode: bridge