Repository navigation
Feature/docker ssl network #27
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.
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
Merged
olivhoenen
merged 41 commits into
iterorganization:develop
from
Louwrensth:feature/docker-ssl-network
Sep 23, 2026
Merged
Changes from 20 commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
3839d8d
docker: reduce common statements, separate concerns
Louwrensth b210f03
docker: separate server-http config
Louwrensth 50ca09b
docker: rename location snippets
Louwrensth 9569da3
docker: add server-https config
Louwrensth 5b86009
docker: add http redirect to https
Louwrensth 1286eb4
make: add USE_HTTPS=1 switch, update docs
Louwrensth 0f79db5
docker: add nginx/ssl cert.* generation
Louwrensth a5029c1
docker: merge stage service-https into service
Louwrensth 7991af1
docs: mention scripts/generate-self-signed-certs.sh
Louwrensth 92dc37b
systemd: service using compose override
Louwrensth 04e0ceb
mv docker-compose.https.yml
Louwrensth 5715458
mv .github/workflows/ci.yml
Louwrensth cf1b8ba
update CODEOWNERS
Louwrensth e305deb
.dockerignore: ignore some more
Louwrensth dbc3636
add env file for systemd service
Louwrensth 552ba23
systemd: simplify Makefile
Louwrensth b512dc5
generate-self-signed-certs.sh: add x.509 extension and SAN
Louwrensth 5ef4b92
add more logging
Louwrensth 2bb577c
systemd: use DASHBOARD_CONTAINER_NAME, SIMDB_DASHBOARD_IMAGE
Louwrensth 81bd9eb
nginx: listen ... http2 directive is deprecated
Louwrensth 9fb1237
systemd: latest tag by default, howto using make
Louwrensth dc61e5a
ci: tag and push "latest", create release with tarball asset
Louwrensth 19a156c
Makefile: use conventional install command
Louwrensth 9bb3e3f
fixup! systemd: latest tag by default, howto using make
Louwrensth bef7350
nginx: use gzip_static assets with cache-control
Louwrensth a8e8275
systemd: match description with Dockerfile
Louwrensth ab29434
certs: rootCA-signing; replace ssl->tls, sh->Makefile
Louwrensth a18006b
nginx: add FYI comment, remove double log output
Louwrensth 0ad14d7
nginx: bugfix simdb backend at prefix /scenarios/api
Louwrensth 8b6f1f9
fixup! systemd: simplify Makefile
Louwrensth f4e5fb4
nginx: document good directives for simdb application
Louwrensth cdf8f3d
docs: add systemd installation notes, align comments elsewhere
Louwrensth de869bb
Update help text from Makefile
olivhoenen 4b6116f
ci: add GH_REPO to publish job
Louwrensth 3c80f04
docker: fixup custom DASHBOARD_HTTPS_PORT
Louwrensth 783a5c2
docker: SYSTEMD_CONTAINER_NAME
Louwrensth b7d5696
make systemd-*: prevent early abort
Louwrensth 2ee96ec
make install: only intended key/pem files
Louwrensth 9dd82d2
docker: service execution should --no-build
Louwrensth 695e49c
make deploy: remove placeholder
Louwrensth 624c63f
fixup! nginx: document good directives for simdb application
Louwrensth File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,13 @@ | ||
| .git | ||
| .github | ||
| .vscode | ||
| dashboard/dist | ||
| dashboard/node_modules | ||
| dashboard/.vite | ||
| docker/nginx/ssl/*.crt | ||
| docker/nginx/ssl/*.key | ||
| docs | ||
| scripts | ||
| .env | ||
| .env.* | ||
| node_modules | ||
| dashboard/node_modules | ||
| dashboard/dist | ||
| scripts |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| dist/ | ||
| .idea/ | ||
| dashboard/dist/ | ||
| dashboard/node_modules/ | ||
| .idea/ | ||
| docker/nginx/ssl/*.crt | ||
| docker/nginx/ssl/*.key | ||
| dist/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| # HTTPS override for docker-compose.yml. | ||
| # | ||
| # Only adds or overrides SSL-specific settings. | ||
| # | ||
| # Enable this override by including it in COMPOSE_FILE, | ||
| # after the original, e.g. | ||
| # COMPOSE_FILE="docker-compose.yml:docker-compose.https.yml" | ||
| # COMPOSE_FILE="docker-compose.yml:docker-compose.https.yml:docker-compose.systemd.yml" | ||
| # | ||
| services: | ||
| dashboard: | ||
| environment: | ||
| # Use server-https.conf when SSL certificates (cert.crt and cert.key) are provided. | ||
| SERVER_CONF: ${SERVER_CONF:-server-https.conf} | ||
| ports: | ||
| - "${DASHBOARD_PORT:-80}:80" | ||
| - "${DASHBOARD_HTTPS_PORT:-443}:443" | ||
| volumes: | ||
| - ./docker/nginx/templates:/etc/nginx/templates | ||
| - ./docker/nginx/ssl:/etc/nginx/ssl:ro |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # Systemd override for docker-compose.yml. | ||
| # | ||
| # Uses the GHCR-published image instead of a local build. | ||
| # | ||
| # Set SIMDB_DASHBOARD_TAG in the environment file to pin a specific | ||
| # version. The default is the latest tag at the time of writing. | ||
| # | ||
| # Enable this override by including it in COMPOSE_FILE, | ||
| # after the original, e.g. | ||
| # COMPOSE_FILE="docker-compose.yml:docker-compose.https.yml" | ||
| # COMPOSE_FILE="docker-compose.yml:docker-compose.https.yml:docker-compose.systemd.yml" | ||
| # | ||
| services: | ||
| dashboard: | ||
| image: ${SIMDB_DASHBOARD_IMAGE:-ghcr.io/iterorganization/simdb-dashboard:${SIMDB_DASHBOARD_TAG:-service-0.9.0-68-g8819049}} | ||
|
Louwrensth marked this conversation as resolved.
Resolved
|
||
| logging: | ||
| driver: journald | ||
| options: | ||
| tag: simdb-dashboard | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #!/usr/bin/env sh | ||
| set -eu | ||
|
|
||
| cp "/etc/nginx/conf.d/snippets/${SERVER_CONF:-server-http.conf}" /etc/nginx/conf.d/snippets/server.conf |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| # This directory expects cert.crt and cert.key files. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # Relies on official nginx image default behavior: /etc/nginx/templates/*.template | ||
| # are envsubst-processed into /etc/nginx/conf.d at container startup. | ||
| # See: https://github.com/docker-library/docs/tree/master/nginx | ||
|
|
||
| # Log to container stdout/stderr so logs are visible via `docker compose logs`. | ||
| # Change `info` to `debug` for maximum verbosity (requires nginx debug build). | ||
| error_log /dev/stderr info; | ||
| access_log /dev/stdout; | ||
|
|
||
| # Hostnames inside upstream blocks are resolved at config-load time using the | ||
| # system resolver, which does read /etc/hosts. | ||
| upstream simdb_backend { | ||
| server ${API_HOST}:${API_PORT}; | ||
| } | ||
|
|
||
| # Server block include is selected at startup by /docker-entrypoint.d/25-select-server-conf.sh | ||
| # using SERVER_CONF (default: server-http.conf). | ||
| include /etc/nginx/conf.d/snippets/server.conf; |
20 changes: 20 additions & 0 deletions
20
docker/nginx/templates/snippets/location-dashboard.conf.template
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| # dashboard app expects request url path to start with /dashboard/ | ||
| location = / { return 302 /dashboard/; } | ||
| location = /dashboard { return 302 /dashboard/; } | ||
| location /dashboard/ { | ||
| try_files $uri $uri/ /dashboard/index.html; | ||
| } | ||
|
|
||
| # dashboard is a simdb client; | ||
| # runtime-config.js defines the simdb remote url to use. | ||
| location = /dashboard/runtime-config.js { | ||
| default_type application/javascript; | ||
| add_header Cache-Control "no-cache, no-store, must-revalidate"; | ||
| alias /etc/nginx/templates/snippets/runtime-config-template.js; | ||
| sub_filter_once off; | ||
| sub_filter_types application/javascript; | ||
| # Optional tokens to replace in template: | ||
| sub_filter 'SIMDB_SERVER_URL' '${SIMDB_SERVER_URL}'; | ||
| sub_filter 'API_HOST' '${API_HOST}'; | ||
| sub_filter 'API_PORT' '${API_PORT}'; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.