Skip to content

Feature/update deployment #61

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

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
+310 −361
Draft

Feature/update deployment #61

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
56bfc47
feat: merge quickstart.md and README.md to one document
KarlG-nbis Sep 25, 2025
5e35b14
feat: add info noting that current version of sda-pipeline does not s…
KarlG-nbis Sep 25, 2025
d4d5a2e
feat: update images, python:3.10-slim -> python:3.10-slim-bookworm, u…
KarlG-nbis Sep 25, 2025
2628b1e
feat: update images and config for the TLS example
KarlG-nbis Sep 25, 2025
0c6d105
feat: add refernce to TLS-example/README.md from README.md
KarlG-nbis Sep 25, 2025
a0b3e3e
feat: fix auth service image in TlS-example as it no longer in its ow…
KarlG-nbis Sep 26, 2025
4e41124
feat: update README.md, fix links to outdated docs, fix sda-cli comma…
KarlG-nbis Sep 26, 2025
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
329 changes: 280 additions & 49 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion config/TLS-example/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ inbox:
secretkey:

c4gh:
passphrase:
privateKeys:
- filepath:
passphrase:

elixir:
id:
Expand Down
5 changes: 3 additions & 2 deletions config/TLS-example/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ broker:
# clientKey: /certificates/tls.key

c4gh:
passphrase: ""
filepath: "/c4gh/gdi.sec.pem"
privateKeys:
- filepath: "/c4gh/gdi.sec.pem"
passphrase: ""

db:
host: "postgres"
Expand Down
18 changes: 9 additions & 9 deletions config/TLS-example/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
auth:
container_name: auth
image: ghcr.io/neicnordic/sensitive-data-archive:v0.2.23-auth
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14-auth
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14-auth
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14

Auth doesn't have a separate image anymore.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to use ghcr.io/neicnordic/sensitive-data-archive:v3.0.14 with command: sda-auth, is there any env vars that we need to populate as well?

networks:
- public
ports:
Expand Down Expand Up @@ -31,7 +31,7 @@ services:
interval: 5s
timeout: 20s
retries: 20
image: ghcr.io/neicnordic/sensitive-data-archive:v0.2.23-rabbitmq
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14-rabbitmq
networks:
- secure
ports:
Expand Down Expand Up @@ -63,7 +63,7 @@ services:
interval: 5s
timeout: 20s
retries: 20
image: ghcr.io/neicnordic/sensitive-data-archive:v0.2.23-postgres
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14-postgres
networks:
- secure
restart: always
Expand All @@ -80,7 +80,7 @@ services:
environment:
- DB_PASSWORD=${download_DB_PASSWORD}
- DB_USER=download
image: ghcr.io/neicnordic/sensitive-data-archive:v0.2.23-download
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14-download
networks:
- public
- secure
Expand Down Expand Up @@ -109,7 +109,7 @@ services:
- BROKER_USER=finalize
- DB_PASSWORD=${finalize_DB_PASSWORD}
- DB_USER=finalize
image: ghcr.io/neicnordic/sensitive-data-archive:v0.2.23
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14
networks:
- secure
restart: always
Expand All @@ -132,7 +132,7 @@ services:
- BROKER_USER=ingest
- DB_PASSWORD=${ingest_DB_PASSWORD}
- DB_USER=ingest
image: ghcr.io/neicnordic/sensitive-data-archive:v0.2.23
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14
networks:
- secure
restart: always
Expand All @@ -155,7 +155,7 @@ services:
- BROKER_USER=mapper
- DB_PASSWORD=${mapper_DB_PASSWORD}
- DB_USER=mapper
image: ghcr.io/neicnordic/sensitive-data-archive:v0.2.23
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14
networks:
- secure
restart: always
Expand All @@ -178,7 +178,7 @@ services:
- BROKER_USER=verify
- DB_PASSWORD=${verify_DB_PASSWORD}
- DB_USER=verify
image: ghcr.io/neicnordic/sensitive-data-archive:v0.2.23
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14
networks:
- secure
restart: always
Expand All @@ -201,7 +201,7 @@ services:
- BROKER_USER=inbox
- DB_PASSWORD=${s3inbox_DB_PASSWORD}
- DB_USER=inbox
image: ghcr.io/neicnordic/sensitive-data-archive:v0.2.23
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14
networks:
- public
- secure
Expand Down
5 changes: 3 additions & 2 deletions config/config.yaml.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ broker:
ssl: "false"

c4gh:
passphrase: "c4ghpass"
filepath: "/shared/c4gh.sec.pem"
privateKeys:
- filepath: "/shared/c4gh.sec.pem"
passphrase: "c4ghpass"

db:
host: "postgres"
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-demo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
interval: 5s
timeout: 10s
retries: 20
image: python:3.10-slim
image: python:3.10-slim-bookworm
networks:
- public
ports:
Expand Down
23 changes: 11 additions & 12 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
- PGPASSWORD=${credentials_PGPASSWORD}
env_file:
- .env
image: python:3.10-slim
image: python:3.10-slim-bookworm
networks:
- secure
volumes:
Expand All @@ -27,7 +27,7 @@ services:
auth:
container_name: auth
command: sda-auth
image: ghcr.io/neicnordic/sensitive-data-archive:v0.3.25
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14
depends_on:
credentials:
condition: service_completed_successfully
Expand Down Expand Up @@ -65,7 +65,7 @@ services:
interval: 5s
timeout: 20s
retries: 20
image: ghcr.io/neicnordic/sensitive-data-archive:v0.3.25-rabbitmq
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14-rabbitmq
networks:
- secure
ports:
Expand All @@ -89,7 +89,7 @@ services:
interval: 5s
timeout: 20s
retries: 20
image: ghcr.io/neicnordic/sensitive-data-archive:v0.3.25-postgres
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14-postgres
networks:
- secure
restart: always
Expand Down Expand Up @@ -139,10 +139,9 @@ services:
- DB_PASSWORD=${download_DB_PASSWORD}
- DB_USER=${download_DB_USER}
- OIDC_CONFIGURATION_URL=http://${DOCKERHOST:-dockerhost}:8080/oidc/.well-known/openid-configuration
- ARCHIVE_TYPE=s3seekable
extra_hosts:
- ${DOCKERHOST:-dockerhost}:host-gateway
image: harbor.nbis.se/gdi/sda-download:20240415
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14-download
networks:
- public
- secure
Expand Down Expand Up @@ -173,7 +172,7 @@ services:
- BROKER_USER=${finalize_BROKER_USER}
- DB_PASSWORD=${finalize_DB_PASSWORD}
- DB_USER=${finalize_DB_USER}
image: ghcr.io/neicnordic/sensitive-data-archive:v0.3.25
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14
networks:
- secure
restart: always
Expand All @@ -199,7 +198,7 @@ services:
- BROKER_USER=${ingest_BROKER_USER}
- DB_PASSWORD=${ingest_DB_PASSWORD}
- DB_USER=${ingest_DB_USER}
image: ghcr.io/neicnordic/sensitive-data-archive:v0.3.25
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14
networks:
- secure
restart: always
Expand All @@ -225,7 +224,7 @@ services:
- BROKER_USER=${mapper_BROKER_USER}
- DB_PASSWORD=${mapper_DB_PASSWORD}
- DB_USER=${mapper_DB_USER}
image: ghcr.io/neicnordic/sensitive-data-archive:v0.3.25
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14
networks:
- secure
restart: always
Expand All @@ -251,7 +250,7 @@ services:
- BROKER_USER=${verify_BROKER_USER}
- DB_PASSWORD=${verify_DB_PASSWORD}
- DB_USER=${verify_DB_USER}
image: ghcr.io/neicnordic/sensitive-data-archive:v0.3.25
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14
networks:
- secure
restart: always
Expand Down Expand Up @@ -280,7 +279,7 @@ services:
- SERVER_JWTPUBKEYURL=http://${DOCKERHOST:-dockerhost}:8080/oidc/jwk
extra_hosts:
- ${DOCKERHOST:-dockerhost}:host-gateway
image: ghcr.io/neicnordic/sensitive-data-archive:v0.3.25
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14
networks:
- public
- secure
Expand All @@ -297,7 +296,7 @@ services:
depends_on:
credentials:
condition: service_completed_successfully
image: ghcr.io/neicnordic/sensitive-data-archive:v0.3.25
image: ghcr.io/neicnordic/sensitive-data-archive:v3.0.14
networks:
- secure
restart: always
Expand Down
Loading