home/docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correction of ssl and changed environments after upgrading.

Browse Source
This commit is contained in:
Christian Steinle
2022-12-22 05:23:54 +01:00
parent acbf5c4c71
commit d2a26929df
6 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbor/common/config/core/env
View File

@@ -21,8 +21,8 @@ PORTAL_URL=http://portal:8080
TOKEN_SERVICE_URL=http://core:8080/service/token TOKEN_SERVICE_URL=http://core:8080/service/token
HARBOR_ADMIN_PASSWORD=j2Q2gRX@zpGYGsUZwJ@ynvnU3gw6Y* HARBOR_ADMIN_PASSWORD=j2Q2gRX@zpGYGsUZwJ@ynvnU3gw6Y*
MAX_JOB_WORKERS=10 MAX_JOB_WORKERS=10
CORE_SECRET=2WyVPYUlCIRDPCv2 CORE_SECRET=krGpB3TQ5AgYcjOn
JOBSERVICE_SECRET=a1XRgtkNICmX2Gl4 JOBSERVICE_SECRET=vh9rj0lY4mqPvdn3
WITH_NOTARY=False WITH_NOTARY=False
WITH_TRIVY=True WITH_TRIVY=True
CORE_URL=http://core:8080 CORE_URL=http://core:8080
@@ -37,13 +37,13 @@ CHART_REPOSITORY_URL=http://chartmuseum:9999
REGISTRY_CONTROLLER_URL=http://registryctl:8080 REGISTRY_CONTROLLER_URL=http://registryctl:8080
WITH_CHARTMUSEUM=False WITH_CHARTMUSEUM=False
REGISTRY_CREDENTIAL_USERNAME=harbor_registry_user REGISTRY_CREDENTIAL_USERNAME=harbor_registry_user
REGISTRY_CREDENTIAL_PASSWORD=RvC6BuQM4kFianaQ81mMxGuDHdNEQ5Yp REGISTRY_CREDENTIAL_PASSWORD=Jv2MbRB4lfPbxDo4cJQCfxg3kcok64FT
CSRF_KEY=hPD1uJIjELdXLCH2Z6zFWS6JDT0JGRHc CSRF_KEY=gvqZb6yOzECdq3dU7YQBfnU5AZMcooRJ
PERMITTED_REGISTRY_TYPES_FOR_PROXY_CACHE=docker-hub,harbor,azure-acr,aws-ecr,google-gcr,quay,docker-registry,github-ghcr PERMITTED_REGISTRY_TYPES_FOR_PROXY_CACHE=docker-hub,harbor,azure-acr,aws-ecr,google-gcr,quay,docker-registry,github-ghcr
HTTP_PROXY= HTTP_PROXY=
HTTPS_PROXY= HTTPS_PROXY=
NO_PROXY=localhost,log,.internal,exporter,db,.local,portal,redis,127.0.0.1,registryctl,nginx,core,jobservice,chartmuseum,notary-signer,trivy-adapter,registry,postgresql,notary-server NO_PROXY=postgresql,core,chartmuseum,.internal,redis,log,127.0.0.1,exporter,portal,notary-signer,registry,notary-server,db,nginx,jobservice,localhost,trivy-adapter,.local,registryctl
PORT=8080 PORT=8080

8
harbor/common/config/jobservice/env
View File

@@ -1,6 +1,6 @@
CORE_SECRET=2WyVPYUlCIRDPCv2 CORE_SECRET=krGpB3TQ5AgYcjOn
REGISTRY_URL=http://registry:5000 REGISTRY_URL=http://registry:5000
JOBSERVICE_SECRET=a1XRgtkNICmX2Gl4 JOBSERVICE_SECRET=vh9rj0lY4mqPvdn3
CORE_URL=http://core:8080 CORE_URL=http://core:8080
REGISTRY_CONTROLLER_URL=http://registryctl:8080 REGISTRY_CONTROLLER_URL=http://registryctl:8080
JOBSERVICE_WEBHOOK_JOB_MAX_RETRY=10 JOBSERVICE_WEBHOOK_JOB_MAX_RETRY=10
@@ -8,9 +8,9 @@ JOBSERVICE_WEBHOOK_JOB_MAX_RETRY=10
HTTP_PROXY= HTTP_PROXY=
HTTPS_PROXY= HTTPS_PROXY=
NO_PROXY=localhost,log,.internal,exporter,db,.local,portal,redis,127.0.0.1,registryctl,nginx,core,jobservice,chartmuseum,notary-signer,trivy-adapter,registry,postgresql,notary-server NO_PROXY=postgresql,core,chartmuseum,.internal,redis,log,127.0.0.1,exporter,portal,notary-signer,registry,notary-server,db,nginx,jobservice,localhost,trivy-adapter,.local,registryctl
REGISTRY_CREDENTIAL_USERNAME=harbor_registry_user REGISTRY_CREDENTIAL_USERNAME=harbor_registry_user
REGISTRY_CREDENTIAL_PASSWORD=RvC6BuQM4kFianaQ81mMxGuDHdNEQ5Yp REGISTRY_CREDENTIAL_PASSWORD=Jv2MbRB4lfPbxDo4cJQCfxg3kcok64FT

2
harbor/common/config/registry/passwd
View File

@@ -1 +1 @@
harbor_registry_user:$2y$05$paAwVLgr1maxYnL9fud8q.u7SiU/75K/ra2aeEcYNJt22ro/st4qe harbor_registry_user:$2y$05$.N3TFhxdJ5K5OMhNf491Y.bLVsJb4OXRivmx/AMsYFbkRzmXi8QO2

4
harbor/common/config/registryctl/env
View File

@@ -1,2 +1,2 @@
CORE_SECRET=2WyVPYUlCIRDPCv2 CORE_SECRET=krGpB3TQ5AgYcjOn
JOBSERVICE_SECRET=a1XRgtkNICmX2Gl4 JOBSERVICE_SECRET=vh9rj0lY4mqPvdn3

2
harbor/common/config/trivy-adapter/env
View File

@@ -16,4 +16,4 @@ SCANNER_TRIVY_INSECURE=False
SCANNER_TRIVY_TIMEOUT=5m0s SCANNER_TRIVY_TIMEOUT=5m0s
HTTP_PROXY= HTTP_PROXY=
HTTPS_PROXY= HTTPS_PROXY=
NO_PROXY=localhost,log,.internal,exporter,db,.local,portal,redis,127.0.0.1,registryctl,nginx,core,jobservice,chartmuseum,notary-signer,trivy-adapter,registry,postgresql,notary-server NO_PROXY=postgresql,core,chartmuseum,.internal,redis,log,127.0.0.1,exporter,portal,notary-signer,registry,notary-server,db,nginx,jobservice,localhost,trivy-adapter,.local,registryctl

1
harbor/docker-compose.yml
View File

@@ -261,7 +261,6 @@ services:
- "traefik.http.routers.harbor-secure.service=harbor-secure" - "traefik.http.routers.harbor-secure.service=harbor-secure"
- "traefik.http.routers.harbor-secure.tls=true" - "traefik.http.routers.harbor-secure.tls=true"
- "traefik.http.routers.harbor-secure.tls.certresolver=myresolver" - "traefik.http.routers.harbor-secure.tls.certresolver=myresolver"
- "traefik.http.routers.harbor-secure.tls.domains[0].main=cs-registry.ddnss.de"
- "traefik.http.services.harbor-secure.loadbalancer.server.port=8080" - "traefik.http.services.harbor-secure.loadbalancer.server.port=8080"
trivy-adapter: trivy-adapter: