Skip to content

Commit

Permalink
Fixes after fork
Browse files Browse the repository at this point in the history
  • Loading branch information
kkochel committed Feb 20, 2024
1 parent 5e2d2d0 commit 1a95cd0
Show file tree
Hide file tree
Showing 21 changed files with 139 additions and 138 deletions.
101 changes: 0 additions & 101 deletions .github/dependabot.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/integration/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ services:
interval: 5s
timeout: 20s
retries: 3
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}-postgres
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}-postgres
ports:
- "35432:5432"
restart: always
Expand All @@ -70,7 +70,7 @@ services:
interval: 5s
timeout: 20s
retries: 3
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}-postgres
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}-postgres
ports:
- "15432:5432"
restart: always
Expand All @@ -94,7 +94,7 @@ services:
interval: 5s
timeout: 20s
retries: 3
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}-postgres
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}-postgres
ports:
- "25432:5432"
restart: always
Expand Down
4 changes: 2 additions & 2 deletions .github/integration/rabbitmq-federation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ services:
- BROKER_CLIENTKEY=/certs/client.key
- BROKER_CACERT=/certs/ca.crt
- LOG_LEVEL=debug
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}
restart: always
volumes:
- certs:/certs
Expand Down Expand Up @@ -111,7 +111,7 @@ services:
interval: 5s
timeout: 20s
retries: 3
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}-rabbitmq
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}-rabbitmq
ports:
- "15672:15671"
restart: always
Expand Down
6 changes: 3 additions & 3 deletions .github/integration/sda-posix-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ services:
interval: 5s
timeout: 20s
retries: 3
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}-postgres
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}-postgres
ports:
- "15432:5432"
restart: always
Expand Down Expand Up @@ -110,7 +110,7 @@ services:
interval: 5s
timeout: 20s
retries: 3
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}-rabbitmq
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}-rabbitmq
ports:
- "25671:15671"
restart: always
Expand All @@ -121,7 +121,7 @@ services:
inbox:
build:
context: ../../sda-sftp-inbox
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}-sftp-inbox
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}-sftp-inbox
container_name: inbox
depends_on:
certfixer:
Expand Down
20 changes: 10 additions & 10 deletions .github/integration/sda-s3-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
interval: 10s
timeout: 2s
retries: 6
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}-postgres
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}-postgres
ports:
- "15432:5432"
restart: always
Expand All @@ -49,7 +49,7 @@ services:
interval: 10s
timeout: 5s
retries: 6
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}-rabbitmq
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}-rabbitmq
ports:
- "15672:15672"
restart: always
Expand Down Expand Up @@ -81,7 +81,7 @@ services:
GOLANG_VERSION: ${GOLANG_VERSION:-1.20}
context: ../../sda
target: debug
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}
command: [ sda-s3inbox ]
container_name: s3inbox
depends_on:
Expand Down Expand Up @@ -110,7 +110,7 @@ services:
- "18001:8001"

ingest:
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}
command: [ sda-ingest ]
container_name: ingest
depends_on:
Expand All @@ -135,7 +135,7 @@ services:
- shared:/shared

verify:
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}
command: [ sda-verify ]
container_name: verify
depends_on:
Expand All @@ -160,7 +160,7 @@ services:
- shared:/shared

finalize:
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}
command: [ sda-finalize ]
container_name: finalize
depends_on:
Expand All @@ -185,7 +185,7 @@ services:
- shared:/shared

mapper:
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}
command: [ sda-mapper ]
container_name: mapper
depends_on:
Expand All @@ -209,7 +209,7 @@ services:
- shared:/shared

sync:
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}
command: [ sda-sync ]
container_name: sync
depends_on:
Expand All @@ -233,7 +233,7 @@ services:
- shared:/shared

sync-api:
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}
command: [ sda-syncapi ]
container_name: sync-api
depends_on:
Expand Down Expand Up @@ -295,7 +295,7 @@ services:
- BROKER_ROUTINGERROR=error
- DB_PASSWORD=download
- DB_USER=download
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}
image: ghcr.io/BiobankLab/sensitive-data-archive:PR${PR_NUMBER}
ports:
- "8090:8080"
restart: always
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/functionality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
- name: Build image
run: |
cd sda-sftp-inbox
docker build -t neicnordic/sda-inbox-sftp:latest .
docker build -t BiobankLab/sda-inbox-sftp:latest .
- name: Start Services
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
with:
token: ${{ secrets.GHCR_TOKEN }}
commit-message: Bump chart version
author: neicnordic <neicnordic@users.noreply.github.com>
author: BiobankLab <BiobankLab@users.noreply.github.com>
base: main
branch: bump
delete-branch: true
Expand All @@ -130,4 +130,4 @@ jobs:
Bump the appVersion to: ${{ needs.tag_release.outputs.tag }}
labels: |
automated pr
team-reviewers: neicnordic/sensitive-data-development-collaboration
team-reviewers: BiobankLab/sensitive-data-development-collaboration
4 changes: 2 additions & 2 deletions .github/workflows/update-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Update documentation

# NOTE: This action requires that a github secret exists in this repository
# named NEIC_SDA_ACCESS, containing a github token with the
# "Actions: Read and Write" permission on the neicnordic/neic-sda
# "Actions: Read and Write" permission on the BiobankLab/neic-sda
# repository.

on:
Expand All @@ -20,7 +20,7 @@ jobs:
result=$(curl -X POST \
-H "Authorization: Bearer ${{secrets.NEIC_SDA_ACCESS}}" \
-H "Accept: application/vnd.github.v3+json" \
https://api.github.com/repos/neicnordic/neic-sda/actions/workflows/aggregate.yml/dispatches \
https://api.github.com/repos/BiobankLab/neic-sda/actions/workflows/aggregate.yml/dispatches \
-d "{\"ref\": \"master\", \"inputs\":{\"repository\": \"$GITHUB_REPOSITORY\"}}")
if [ -n "$result" ]; then
echo "$result"
Expand Down
2 changes: 1 addition & 1 deletion charts/sda-db/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: sda-db
version: 0.8.11
appVersion: v0.2.88
appVersion: v0.1.00
kubeVersion: '>= 1.26.0'
description: Database component for Sensitive Data Archive (SDA) installation
home: https://neic-sda.readthedocs.io
Expand Down
2 changes: 1 addition & 1 deletion charts/sda-db/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ externalPkiService:
extraSecurityContext: {}

image:
repository: ghcr.io/neicnordic/sensitive-data-archive
repository: ghcr.io/BiobankLab/sensitive-data-archive
tag:
pullPolicy: IfNotPresent

Expand Down
2 changes: 1 addition & 1 deletion charts/sda-mq/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: sda-mq
version: 0.7.12
appVersion: v0.2.88
appVersion: v0.1.00
kubeVersion: '>= 1.26.0'
description: RabbitMQ component for Sensitive Data Archive (SDA) installation
home: https://neic-sda.readthedocs.io
Expand Down
2 changes: 1 addition & 1 deletion charts/sda-mq/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ externalPkiService:
extraSecurityContext: {}

image:
repository: ghcr.io/neicnordic/sensitive-data-archive
repository: ghcr.io/BiobankLab/sensitive-data-archive
tag:
pullPolicy: Always

Expand Down
2 changes: 1 addition & 1 deletion charts/sda-orch/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

image:
repository: ghcr.io/neicnordic/sda-orch
repository: ghcr.io/BiobankLab/sda-orch
tag: v0.10.2
pullPolicy: Always
logLevel: "info"
Expand Down
2 changes: 1 addition & 1 deletion charts/sda-svc/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: sda-svc
version: 0.23.7
appVersion: v0.2.88
appVersion: v0.1.00
kubeVersion: '>= 1.26.0'
description: Components for Sensitive Data Archive (SDA) installation
home: https://neic-sda.readthedocs.io
Expand Down
8 changes: 4 additions & 4 deletions charts/sda-svc/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Default values for SDA services.
# Declare variables to be passed into your templates.
image:
repository: "ghcr.io/neicnordic/sensitive-data-archive"
repository: "ghcr.io/BiobankLab/sensitive-data-archive"
tag:
pullPolicy: "Always"

Expand Down Expand Up @@ -354,7 +354,7 @@ auth:

doa:
name: doa
repository: ghcr.io/neicnordic/sda-doa
repository: ghcr.io/BiobankLab/sda-doa
imageTag: v1.6.62
imagePullPolicy: IfNotPresent
replicaCount: 2
Expand Down Expand Up @@ -532,7 +532,7 @@ syncapi:

releasetest:
run: false
repository: neicnordic/sda-helm-tests-support
repository: BiobankLab/sda-helm-tests-support
imageTag: latest
imagePullPolicy: IfNotPresent
tls:
Expand All @@ -542,7 +542,7 @@ releasetest:

verify:
replicaCount: 1
repository: ghcr.io/neicnordic/sda-pipeline
repository: ghcr.io/BiobankLab/sda-pipeline
imageTag: v0.4.27
imagePullPolicy: IfNotPresent
resources:
Expand Down
Loading

0 comments on commit 1a95cd0

Please sign in to comment.