From b3814ab4c7962c42f9c4e4fde86abc05a7ef6257 Mon Sep 17 00:00:00 2001 From: Julia Simon <611228+hithwen@users.noreply.github.com> Date: Tue, 26 Jul 2022 15:03:02 +0200 Subject: [PATCH 1/5] Remove unused envs, update existing ones --- .../compose/harbor-1.10.0/docker-compose.yml | 4 +- .../harbor-1.4.0/config/adminserver/env | 54 ----- .../tests/compose/harbor-1.4.0/config/db/env | 1 - .../harbor-1.4.0/config/jobservice/app.conf | 5 - .../harbor-1.4.0/config/jobservice/env | 6 - .../harbor-1.4.0/config/nginx/nginx.conf | 83 -------- .../harbor-1.4.0/config/registry/config.yml | 34 --- .../compose/harbor-1.4.0/config/ui/app.conf | 6 - .../tests/compose/harbor-1.4.0/config/ui/env | 8 - .../harbor-1.4.0/config/ui/private_key.pem | 51 ----- .../compose/harbor-1.4.0/docker-compose.yml | 85 -------- .../harbor-1.5.0/config/adminserver/env | 63 ------ .../tests/compose/harbor-1.5.0/config/db/env | 1 - .../harbor-1.5.0/config/jobservice/config.yml | 30 --- .../harbor-1.5.0/config/jobservice/env | 4 - .../harbor-1.5.0/config/nginx/nginx.conf | 83 -------- .../harbor-1.5.0/config/registry/config.yml | 34 --- .../compose/harbor-1.5.0/config/ui/app.conf | 6 - .../tests/compose/harbor-1.5.0/config/ui/env | 8 - .../harbor-1.5.0/config/ui/private_key.pem | 51 ----- .../compose/harbor-1.5.0/docker-compose.yml | 92 --------- .../harbor-1.6.0/config/adminserver/env | 67 ------ .../harbor-1.6.0/config/chartserver/env | 41 ---- .../tests/compose/harbor-1.6.0/config/db/env | 1 - .../harbor-1.6.0/config/jobservice/config.yml | 29 --- .../harbor-1.6.0/config/jobservice/env | 4 - .../harbor-1.6.0/config/nginx/nginx.conf | 78 ------- .../harbor-1.6.0/config/registry/config.yml | 38 ---- .../config/registryctl/config.yml | 8 - .../harbor-1.6.0/config/registryctl/env | 3 - .../compose/harbor-1.6.0/config/ui/app.conf | 6 - .../tests/compose/harbor-1.6.0/config/ui/env | 10 - .../harbor-1.6.0/config/ui/private_key.pem | 51 ----- .../compose/harbor-1.6.0/docker-compose.yml | 105 ---------- .../harbor-1.7.0/config/adminserver/env | 68 ------ .../harbor-1.7.0/config/chartserver/env | 41 ---- .../compose/harbor-1.7.0/config/core/app.conf | 6 - .../compose/harbor-1.7.0/config/core/env | 11 - .../harbor-1.7.0/config/core/private_key.pem | 51 ----- .../tests/compose/harbor-1.7.0/config/db/env | 1 - .../harbor-1.7.0/config/jobservice/config.yml | 41 ---- .../harbor-1.7.0/config/jobservice/env | 3 - .../harbor-1.7.0/config/nginx/nginx.conf | 133 ------------ .../harbor-1.7.0/config/registry/config.yml | 38 ---- .../config/registryctl/config.yml | 8 - .../harbor-1.7.0/config/registryctl/env | 3 - .../compose/harbor-1.7.0/docker-compose.yml | 193 ------------------ .../harbor-1.8.0/config/cert/server.crt | 0 .../harbor-1.8.0/config/cert/server.key | 0 .../harbor-1.8.0/config/chartserver/env | 40 ---- .../compose/harbor-1.8.0/config/core/app.conf | 6 - .../compose/harbor-1.8.0/config/core/env | 42 ---- .../harbor-1.8.0/config/core/private_key.pem | 51 ----- .../tests/compose/harbor-1.8.0/config/db/env | 1 - .../harbor-1.8.0/config/jobservice/config.yml | 39 ---- .../harbor-1.8.0/config/jobservice/env | 3 - .../harbor-1.8.0/config/nginx/nginx.conf | 135 ------------ .../harbor-1.8.0/config/registry/config.yml | 43 ---- .../config/registryctl/config.yml | 8 - .../harbor-1.8.0/config/registryctl/env | 2 - .../compose/harbor-1.8.0/docker-compose.yml | 183 ----------------- .../compose/harbor-2.0.5/docker-compose.yml | 4 +- harbor/tox.ini | 3 +- 63 files changed, 5 insertions(+), 2302 deletions(-) delete mode 100644 harbor/tests/compose/harbor-1.4.0/config/adminserver/env delete mode 100644 harbor/tests/compose/harbor-1.4.0/config/db/env delete mode 100644 harbor/tests/compose/harbor-1.4.0/config/jobservice/app.conf delete mode 100644 harbor/tests/compose/harbor-1.4.0/config/jobservice/env delete mode 100644 harbor/tests/compose/harbor-1.4.0/config/nginx/nginx.conf delete mode 100644 harbor/tests/compose/harbor-1.4.0/config/registry/config.yml delete mode 100644 harbor/tests/compose/harbor-1.4.0/config/ui/app.conf delete mode 100644 harbor/tests/compose/harbor-1.4.0/config/ui/env delete mode 100644 harbor/tests/compose/harbor-1.4.0/config/ui/private_key.pem delete mode 100644 harbor/tests/compose/harbor-1.4.0/docker-compose.yml delete mode 100644 harbor/tests/compose/harbor-1.5.0/config/adminserver/env delete mode 100644 harbor/tests/compose/harbor-1.5.0/config/db/env delete mode 100644 harbor/tests/compose/harbor-1.5.0/config/jobservice/config.yml delete mode 100644 harbor/tests/compose/harbor-1.5.0/config/jobservice/env delete mode 100644 harbor/tests/compose/harbor-1.5.0/config/nginx/nginx.conf delete mode 100644 harbor/tests/compose/harbor-1.5.0/config/registry/config.yml delete mode 100644 harbor/tests/compose/harbor-1.5.0/config/ui/app.conf delete mode 100644 harbor/tests/compose/harbor-1.5.0/config/ui/env delete mode 100644 harbor/tests/compose/harbor-1.5.0/config/ui/private_key.pem delete mode 100644 harbor/tests/compose/harbor-1.5.0/docker-compose.yml delete mode 100644 harbor/tests/compose/harbor-1.6.0/config/adminserver/env delete mode 100644 harbor/tests/compose/harbor-1.6.0/config/chartserver/env delete mode 100644 harbor/tests/compose/harbor-1.6.0/config/db/env delete mode 100644 harbor/tests/compose/harbor-1.6.0/config/jobservice/config.yml delete mode 100644 harbor/tests/compose/harbor-1.6.0/config/jobservice/env delete mode 100644 harbor/tests/compose/harbor-1.6.0/config/nginx/nginx.conf delete mode 100644 harbor/tests/compose/harbor-1.6.0/config/registry/config.yml delete mode 100644 harbor/tests/compose/harbor-1.6.0/config/registryctl/config.yml delete mode 100644 harbor/tests/compose/harbor-1.6.0/config/registryctl/env delete mode 100644 harbor/tests/compose/harbor-1.6.0/config/ui/app.conf delete mode 100644 harbor/tests/compose/harbor-1.6.0/config/ui/env delete mode 100644 harbor/tests/compose/harbor-1.6.0/config/ui/private_key.pem delete mode 100644 harbor/tests/compose/harbor-1.6.0/docker-compose.yml delete mode 100644 harbor/tests/compose/harbor-1.7.0/config/adminserver/env delete mode 100644 harbor/tests/compose/harbor-1.7.0/config/chartserver/env delete mode 100644 harbor/tests/compose/harbor-1.7.0/config/core/app.conf delete mode 100644 harbor/tests/compose/harbor-1.7.0/config/core/env delete mode 100644 harbor/tests/compose/harbor-1.7.0/config/core/private_key.pem delete mode 100644 harbor/tests/compose/harbor-1.7.0/config/db/env delete mode 100644 harbor/tests/compose/harbor-1.7.0/config/jobservice/config.yml delete mode 100644 harbor/tests/compose/harbor-1.7.0/config/jobservice/env delete mode 100644 harbor/tests/compose/harbor-1.7.0/config/nginx/nginx.conf delete mode 100644 harbor/tests/compose/harbor-1.7.0/config/registry/config.yml delete mode 100644 harbor/tests/compose/harbor-1.7.0/config/registryctl/config.yml delete mode 100644 harbor/tests/compose/harbor-1.7.0/config/registryctl/env delete mode 100644 harbor/tests/compose/harbor-1.7.0/docker-compose.yml delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/cert/server.crt delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/cert/server.key delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/chartserver/env delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/core/app.conf delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/core/env delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/core/private_key.pem delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/db/env delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/jobservice/config.yml delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/jobservice/env delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/nginx/nginx.conf delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/registry/config.yml delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/registryctl/config.yml delete mode 100644 harbor/tests/compose/harbor-1.8.0/config/registryctl/env delete mode 100644 harbor/tests/compose/harbor-1.8.0/docker-compose.yml diff --git a/harbor/tests/compose/harbor-1.10.0/docker-compose.yml b/harbor/tests/compose/harbor-1.10.0/docker-compose.yml index f1969df3c9a44..4066e284c025e 100644 --- a/harbor/tests/compose/harbor-1.10.0/docker-compose.yml +++ b/harbor/tests/compose/harbor-1.10.0/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2.3' +version: '3.8' services: registry: image: goharbor/registry-photon:v2.7.1-patch-2819-2553-v1.10.0 @@ -45,7 +45,7 @@ services: - SETGID - SETUID networks: - harbor: + - harbor dns_search: . env_file: - ./config/db/env diff --git a/harbor/tests/compose/harbor-1.4.0/config/adminserver/env b/harbor/tests/compose/harbor-1.4.0/config/adminserver/env deleted file mode 100644 index 3b3fe29ca32e5..0000000000000 --- a/harbor/tests/compose/harbor-1.4.0/config/adminserver/env +++ /dev/null @@ -1,54 +0,0 @@ -PORT=8080 -LOG_LEVEL=debug -EXT_ENDPOINT=http://localhost -AUTH_MODE=db_auth -SELF_REGISTRATION=on -LDAP_URL=ldaps://ldap.mydomain.com -LDAP_SEARCH_DN= -LDAP_SEARCH_PWD= -LDAP_BASE_DN=ou=people,dc=mydomain,dc=com -LDAP_FILTER= -LDAP_UID=uid -LDAP_SCOPE=2 -LDAP_TIMEOUT=5 -LDAP_VERIFY_CERT=true -DATABASE_TYPE=mysql -MYSQL_HOST=mysql -MYSQL_PORT=3306 -MYSQL_USR=root -MYSQL_PWD=root123 -MYSQL_DATABASE=registry -REGISTRY_URL=http://registry:5000 -TOKEN_SERVICE_URL=http://ui/service/token -EMAIL_HOST=smtp.mydomain.com -EMAIL_PORT=25 -EMAIL_USR=sample_admin@mydomain.com -EMAIL_PWD=abc -EMAIL_SSL=false -EMAIL_FROM=admin -EMAIL_IDENTITY= -EMAIL_INSECURE=false -HARBOR_ADMIN_PASSWORD=Harbor12345 -PROJECT_CREATION_RESTRICTION=everyone -MAX_JOB_WORKERS=3 -UI_SECRET=jJdpQL9fNUXscthr -JOBSERVICE_SECRET=GskgQQy4mISrxKaO -TOKEN_EXPIRATION=30 -CFG_EXPIRATION=5 -GODEBUG=netdns=cgo -ADMIRAL_URL=NA -WITH_NOTARY=False -WITH_CLAIR=False -CLAIR_DB_PASSWORD=password -CLAIR_DB_HOST=postgres -CLAIR_DB_PORT=5432 -CLAIR_DB_USERNAME=postgres -CLAIR_DB=postgres -RESET=false -UAA_ENDPOINT=uaa.mydomain.org -UAA_CLIENTID=id -UAA_CLIENTSECRET=secret -UAA_VERIFY_CERT=true -UI_URL=http://ui:8080 -JOBSERVICE_URL=http://jobservice:8080 -REGISTRY_STORAGE_PROVIDER_NAME=filesystem diff --git a/harbor/tests/compose/harbor-1.4.0/config/db/env b/harbor/tests/compose/harbor-1.4.0/config/db/env deleted file mode 100644 index 2637dc082af08..0000000000000 --- a/harbor/tests/compose/harbor-1.4.0/config/db/env +++ /dev/null @@ -1 +0,0 @@ -MYSQL_ROOT_PASSWORD=root123 diff --git a/harbor/tests/compose/harbor-1.4.0/config/jobservice/app.conf b/harbor/tests/compose/harbor-1.4.0/config/jobservice/app.conf deleted file mode 100644 index d238cbf6e30e3..0000000000000 --- a/harbor/tests/compose/harbor-1.4.0/config/jobservice/app.conf +++ /dev/null @@ -1,5 +0,0 @@ -appname = jobservice -runmode = dev - -[dev] -httpport = 8080 diff --git a/harbor/tests/compose/harbor-1.4.0/config/jobservice/env b/harbor/tests/compose/harbor-1.4.0/config/jobservice/env deleted file mode 100644 index c08c0921ba9c8..0000000000000 --- a/harbor/tests/compose/harbor-1.4.0/config/jobservice/env +++ /dev/null @@ -1,6 +0,0 @@ -LOG_LEVEL=debug -CONFIG_PATH=/etc/jobservice/app.conf -UI_SECRET=jJdpQL9fNUXscthr -JOBSERVICE_SECRET=GskgQQy4mISrxKaO -ADMINSERVER_URL=http://adminserver:8080 -GODEBUG=netdns=cgo diff --git a/harbor/tests/compose/harbor-1.4.0/config/nginx/nginx.conf b/harbor/tests/compose/harbor-1.4.0/config/nginx/nginx.conf deleted file mode 100644 index 6913ab967b8fb..0000000000000 --- a/harbor/tests/compose/harbor-1.4.0/config/nginx/nginx.conf +++ /dev/null @@ -1,83 +0,0 @@ -worker_processes auto; - -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - -http { - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - - upstream registry { - server registry:5000; - } - - upstream ui { - server ui:8080; - } - - log_format timed_combined '$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - server { - listen 80; - server_tokens off; - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - location / { - proxy_pass http://ui/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass http://ui/registryproxy/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass http://ui/service/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } -} diff --git a/harbor/tests/compose/harbor-1.4.0/config/registry/config.yml b/harbor/tests/compose/harbor-1.4.0/config/registry/config.yml deleted file mode 100644 index e6c2fd5436529..0000000000000 --- a/harbor/tests/compose/harbor-1.4.0/config/registry/config.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: 0.1 -log: - level: info - fields: - service: registry -storage: - cache: - layerinfo: inmemory - filesystem: - rootdirectory: /storage - maintenance: - uploadpurging: - enabled: false - delete: - enabled: true -http: - addr: :5000 - secret: placeholder - debug: - addr: localhost:5001 -auth: - token: - issuer: harbor-token-issuer - realm: http://localhost/service/token - rootcertbundle: /etc/registry/root.crt - service: harbor-registry -notifications: - endpoints: - - name: harbor - disabled: false - url: http://ui:8080/service/notifications - timeout: 3000ms - threshold: 5 - backoff: 1s diff --git a/harbor/tests/compose/harbor-1.4.0/config/ui/app.conf b/harbor/tests/compose/harbor-1.4.0/config/ui/app.conf deleted file mode 100644 index 6110364ca0440..0000000000000 --- a/harbor/tests/compose/harbor-1.4.0/config/ui/app.conf +++ /dev/null @@ -1,6 +0,0 @@ -appname = Harbor -runmode = dev -enablegzip = true - -[dev] -httpport = 8080 diff --git a/harbor/tests/compose/harbor-1.4.0/config/ui/env b/harbor/tests/compose/harbor-1.4.0/config/ui/env deleted file mode 100644 index d3b873ebf67ab..0000000000000 --- a/harbor/tests/compose/harbor-1.4.0/config/ui/env +++ /dev/null @@ -1,8 +0,0 @@ -LOG_LEVEL=debug -CONFIG_PATH=/etc/ui/app.conf -UI_SECRET=jJdpQL9fNUXscthr -JOBSERVICE_SECRET=GskgQQy4mISrxKaO -GODEBUG=netdns=cgo -ADMINSERVER_URL=http://adminserver:8080 -UAA_CA_ROOT=/etc/ui/certificates/uaa_ca.pem -_REDIS_URL= diff --git a/harbor/tests/compose/harbor-1.4.0/config/ui/private_key.pem b/harbor/tests/compose/harbor-1.4.0/config/ui/private_key.pem deleted file mode 100644 index ad3ba01626525..0000000000000 --- a/harbor/tests/compose/harbor-1.4.0/config/ui/private_key.pem +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/harbor/tests/compose/harbor-1.4.0/docker-compose.yml b/harbor/tests/compose/harbor-1.4.0/docker-compose.yml deleted file mode 100644 index 6dc040c67387c..0000000000000 --- a/harbor/tests/compose/harbor-1.4.0/docker-compose.yml +++ /dev/null @@ -1,85 +0,0 @@ -version: '2' -services: - registry: - image: vmware/registry-photon:v2.6.2-v1.4.0 - container_name: registry - restart: always - volumes: - - ./config/registry/config.yml:/etc/registry/config.yml:z - - ../common/root.crt:/etc/registry/root.crt:z - networks: - - harbor - environment: - - GODEBUG=netdns=cgo - command: - ["serve", "/etc/registry/config.yml"] - mysql: - image: vmware/harbor-db:v1.4.0 - container_name: harbor-db - restart: always - networks: - - harbor - env_file: - - ./config/db/env - adminserver: - image: vmware/harbor-adminserver:v1.4.0 - container_name: harbor-adminserver - env_file: - - ./config/adminserver/env - restart: always - volumes: - - ../common/secretkey:/etc/adminserver/key:z - - data_volume:/data/:z - networks: - - harbor - ui: - image: vmware/harbor-ui:v1.4.0 - container_name: harbor-ui - env_file: - - ./config/ui/env - restart: always - volumes: - - ./config/ui/app.conf:/etc/ui/app.conf:z - - ./config/ui/private_key.pem:/etc/ui/private_key.pem:z - - ../common/secretkey:/etc/ui/key:z - networks: - - harbor - depends_on: - - adminserver - - registry - jobservice: - image: vmware/harbor-jobservice:v1.4.0 - container_name: harbor-jobservice - env_file: - - ./config/jobservice/env - restart: always - volumes: - - ./config/jobservice/app.conf:/etc/jobservice/app.conf:z - - ../common/secretkey:/etc/jobservice/key:z - networks: - - harbor - depends_on: - - ui - - adminserver - proxy: - image: vmware/nginx-photon:v1.4.0 - container_name: nginx - restart: always - volumes: - - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:z - networks: - - harbor - ports: - - 80:80 - - 443:443 - - 4443:4443 - depends_on: - - mysql - - registry - - ui -networks: - harbor: - external: false -volumes: - data_volume: - diff --git a/harbor/tests/compose/harbor-1.5.0/config/adminserver/env b/harbor/tests/compose/harbor-1.5.0/config/adminserver/env deleted file mode 100644 index f15679c2dab20..0000000000000 --- a/harbor/tests/compose/harbor-1.5.0/config/adminserver/env +++ /dev/null @@ -1,63 +0,0 @@ -PORT=8080 -LOG_LEVEL=info -EXT_ENDPOINT=http://localhost -AUTH_MODE=db_auth -SELF_REGISTRATION=on -LDAP_URL=ldaps://ldap.mydomain.com -LDAP_SEARCH_DN= -LDAP_SEARCH_PWD= -LDAP_BASE_DN=ou=people,dc=mydomain,dc=com -LDAP_FILTER= -LDAP_UID=uid -LDAP_SCOPE=2 -LDAP_TIMEOUT=5 -LDAP_VERIFY_CERT=true -LDAP_GROUP_BASEDN=ou=group,dc=mydomain,dc=com -LDAP_GROUP_FILTER=objectclass=group -LDAP_GROUP_GID=cn -LDAP_GROUP_SCOPE=2 -DATABASE_TYPE=mysql -MYSQL_HOST=mysql -MYSQL_PORT=3306 -MYSQL_USR=root -MYSQL_PWD=root123 -MYSQL_DATABASE=registry -REGISTRY_URL=http://registry:5000 -TOKEN_SERVICE_URL=http://ui:8080/service/token -EMAIL_HOST=smtp.mydomain.com -EMAIL_PORT=25 -EMAIL_USR=sample_admin@mydomain.com -EMAIL_PWD=abc -EMAIL_SSL=false -EMAIL_FROM=admin -EMAIL_IDENTITY= -EMAIL_INSECURE=false -HARBOR_ADMIN_PASSWORD=Harbor12345 -PROJECT_CREATION_RESTRICTION=everyone -MAX_JOB_WORKERS=50 -UI_SECRET=zwLrffYTowkr96Ra -JOBSERVICE_SECRET=o3hTR0RyVUPXfyJL -TOKEN_EXPIRATION=30 -CFG_EXPIRATION=5 -GODEBUG=netdns=cgo -ADMIRAL_URL=NA -WITH_NOTARY=False -WITH_CLAIR=False -CLAIR_DB_PASSWORD=password -CLAIR_DB_HOST=postgres -CLAIR_DB_PORT=5432 -CLAIR_DB_USERNAME=postgres -CLAIR_DB=postgres -RESET=false -UAA_ENDPOINT=uaa.mydomain.org -UAA_CLIENTID=id -UAA_CLIENTSECRET=secret -UAA_VERIFY_CERT=true -UI_URL=http://ui:8080 -JOBSERVICE_URL=http://jobservice:8080 -CLAIR_URL=http://clair:6060 -NOTARY_URL=http://notary-server:4443 -REGISTRY_STORAGE_PROVIDER_NAME=filesystem -READ_ONLY=false -SKIP_RELOAD_ENV_PATTERN=$^ -RELOAD_KEY= diff --git a/harbor/tests/compose/harbor-1.5.0/config/db/env b/harbor/tests/compose/harbor-1.5.0/config/db/env deleted file mode 100644 index 2637dc082af08..0000000000000 --- a/harbor/tests/compose/harbor-1.5.0/config/db/env +++ /dev/null @@ -1 +0,0 @@ -MYSQL_ROOT_PASSWORD=root123 diff --git a/harbor/tests/compose/harbor-1.5.0/config/jobservice/config.yml b/harbor/tests/compose/harbor-1.5.0/config/jobservice/config.yml deleted file mode 100644 index ee5f6ef47b3c0..0000000000000 --- a/harbor/tests/compose/harbor-1.5.0/config/jobservice/config.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -#Protocol used to serve -protocol: "http" - -#Config certification if use 'https' protocol -#https_config: -# cert: "server.crt" -# key: "server.key" - -#Server listening port -port: 8080 - -#Worker pool -worker_pool: - #Worker concurrency - workers: 50 - backend: "redis" - #Additional config if use 'redis' backend - redis_pool: - #redis://[arbitrary_username:password@]ipaddress:port/database_index - #or ipaddress:port[,weight,password,database_index] - redis_url: redis:6379 - namespace: "harbor_job_service_namespace" -#Logger for job -logger: - path: "/var/log/jobs" - level: "INFO" - archive_period: 14 #days -#Admin server endpoint -admin_server: "http://adminserver:8080/" diff --git a/harbor/tests/compose/harbor-1.5.0/config/jobservice/env b/harbor/tests/compose/harbor-1.5.0/config/jobservice/env deleted file mode 100644 index 0195c9c4cc173..0000000000000 --- a/harbor/tests/compose/harbor-1.5.0/config/jobservice/env +++ /dev/null @@ -1,4 +0,0 @@ -UI_SECRET=zwLrffYTowkr96Ra -JOBSERVICE_SECRET=o3hTR0RyVUPXfyJL -ADMINSERVER_URL=http://adminserver:8080 -GODEBUG=netdns=cgo diff --git a/harbor/tests/compose/harbor-1.5.0/config/nginx/nginx.conf b/harbor/tests/compose/harbor-1.5.0/config/nginx/nginx.conf deleted file mode 100644 index 6913ab967b8fb..0000000000000 --- a/harbor/tests/compose/harbor-1.5.0/config/nginx/nginx.conf +++ /dev/null @@ -1,83 +0,0 @@ -worker_processes auto; - -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - -http { - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - - upstream registry { - server registry:5000; - } - - upstream ui { - server ui:8080; - } - - log_format timed_combined '$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - server { - listen 80; - server_tokens off; - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - location / { - proxy_pass http://ui/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass http://ui/registryproxy/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass http://ui/service/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } -} diff --git a/harbor/tests/compose/harbor-1.5.0/config/registry/config.yml b/harbor/tests/compose/harbor-1.5.0/config/registry/config.yml deleted file mode 100644 index e6c2fd5436529..0000000000000 --- a/harbor/tests/compose/harbor-1.5.0/config/registry/config.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: 0.1 -log: - level: info - fields: - service: registry -storage: - cache: - layerinfo: inmemory - filesystem: - rootdirectory: /storage - maintenance: - uploadpurging: - enabled: false - delete: - enabled: true -http: - addr: :5000 - secret: placeholder - debug: - addr: localhost:5001 -auth: - token: - issuer: harbor-token-issuer - realm: http://localhost/service/token - rootcertbundle: /etc/registry/root.crt - service: harbor-registry -notifications: - endpoints: - - name: harbor - disabled: false - url: http://ui:8080/service/notifications - timeout: 3000ms - threshold: 5 - backoff: 1s diff --git a/harbor/tests/compose/harbor-1.5.0/config/ui/app.conf b/harbor/tests/compose/harbor-1.5.0/config/ui/app.conf deleted file mode 100644 index 6110364ca0440..0000000000000 --- a/harbor/tests/compose/harbor-1.5.0/config/ui/app.conf +++ /dev/null @@ -1,6 +0,0 @@ -appname = Harbor -runmode = dev -enablegzip = true - -[dev] -httpport = 8080 diff --git a/harbor/tests/compose/harbor-1.5.0/config/ui/env b/harbor/tests/compose/harbor-1.5.0/config/ui/env deleted file mode 100644 index 43dcb0b82e23b..0000000000000 --- a/harbor/tests/compose/harbor-1.5.0/config/ui/env +++ /dev/null @@ -1,8 +0,0 @@ -LOG_LEVEL=info -CONFIG_PATH=/etc/ui/app.conf -UI_SECRET=zwLrffYTowkr96Ra -JOBSERVICE_SECRET=o3hTR0RyVUPXfyJL -GODEBUG=netdns=cgo -ADMINSERVER_URL=http://adminserver:8080 -UAA_CA_ROOT=/etc/ui/certificates/uaa_ca.pem -_REDIS_URL=redis:6379 diff --git a/harbor/tests/compose/harbor-1.5.0/config/ui/private_key.pem b/harbor/tests/compose/harbor-1.5.0/config/ui/private_key.pem deleted file mode 100644 index 2ad457ecc3b97..0000000000000 --- a/harbor/tests/compose/harbor-1.5.0/config/ui/private_key.pem +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/harbor/tests/compose/harbor-1.5.0/docker-compose.yml b/harbor/tests/compose/harbor-1.5.0/docker-compose.yml deleted file mode 100644 index 52f5b361b0d6b..0000000000000 --- a/harbor/tests/compose/harbor-1.5.0/docker-compose.yml +++ /dev/null @@ -1,92 +0,0 @@ -version: '2' -services: - registry: - image: vmware/registry-photon:v2.6.2-v1.5.2 - container_name: registry - restart: always - volumes: - - registry_storage:/storage:z - - ./config/registry/config.yml:/etc/registry/config.yml:z - - ../common/root.crt:/etc/registry/root.crt:z - networks: - - harbor - environment: - - GODEBUG=netdns=cgo - command: - ["serve", "/etc/registry/config.yml"] - mysql: - image: vmware/harbor-db:v1.5.2 - container_name: harbor-db - restart: always - networks: - - harbor - env_file: - - ./config/db/env - adminserver: - image: vmware/harbor-adminserver:v1.5.2 - container_name: harbor-adminserver - env_file: - - ./config/adminserver/env - restart: always - volumes: - - ../common/secretkey:/etc/adminserver/key:z - networks: - - harbor - ui: - image: vmware/harbor-ui:v1.5.2 - container_name: harbor-ui - env_file: - - ./config/ui/env - restart: always - volumes: - - ./config/ui/app.conf:/etc/ui/app.conf:z - - ./config/ui/private_key.pem:/etc/ui/private_key.pem:z - - ../common/secretkey:/etc/ui/key:z - networks: - - harbor - depends_on: - - adminserver - - registry - jobservice: - image: vmware/harbor-jobservice:v1.5.2 - container_name: harbor-jobservice - env_file: - - ./config/jobservice/env - restart: always - volumes: - - jobs_logs:/var/log/jobs:z - - ./config/jobservice/config.yml:/etc/jobservice/config.yml:z - networks: - - harbor - depends_on: - - redis - - ui - - adminserver - redis: - image: vmware/redis-photon:v1.5.2 - container_name: redis - restart: always - networks: - - harbor - proxy: - image: vmware/nginx-photon:v1.5.2 - container_name: nginx - restart: always - volumes: - - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:z - networks: - - harbor - ports: - - 80:80 - - 443:443 - - 4443:4443 - depends_on: - - mysql - - registry - - ui -networks: - harbor: - external: false -volumes: - registry_storage: - jobs_logs: diff --git a/harbor/tests/compose/harbor-1.6.0/config/adminserver/env b/harbor/tests/compose/harbor-1.6.0/config/adminserver/env deleted file mode 100644 index 29feaaf07ee14..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/config/adminserver/env +++ /dev/null @@ -1,67 +0,0 @@ -PORT=8080 -LOG_LEVEL=info -EXT_ENDPOINT=http://localhost -AUTH_MODE=db_auth -SELF_REGISTRATION=on -LDAP_URL=ldaps://ldap.mydomain.com -LDAP_SEARCH_DN= -LDAP_SEARCH_PWD= -LDAP_BASE_DN=ou=people,dc=mydomain,dc=com -LDAP_FILTER= -LDAP_UID=uid -LDAP_SCOPE=2 -LDAP_TIMEOUT=5 -LDAP_VERIFY_CERT=true -DATABASE_TYPE=postgresql -POSTGRESQL_HOST=postgresql -POSTGRESQL_PORT=5432 -POSTGRESQL_USERNAME=postgres -POSTGRESQL_PASSWORD=root123 -POSTGRESQL_DATABASE=registry -LDAP_GROUP_BASEDN=ou=group,dc=mydomain,dc=com -LDAP_GROUP_FILTER=objectclass=group -LDAP_GROUP_GID=cn -LDAP_GROUP_SCOPE=2 -REGISTRY_URL=http://registry:5000 -TOKEN_SERVICE_URL=http://ui:8080/service/token -EMAIL_HOST=smtp.mydomain.com -EMAIL_PORT=25 -EMAIL_USR=sample_admin@mydomain.com -EMAIL_PWD=abc -EMAIL_SSL=false -EMAIL_FROM=admin -EMAIL_IDENTITY= -EMAIL_INSECURE=false -HARBOR_ADMIN_PASSWORD=Harbor12345 -PROJECT_CREATION_RESTRICTION=everyone -MAX_JOB_WORKERS=10 -UI_SECRET=Cl0CiaW42NzV9Fbd -JOBSERVICE_SECRET=3AD4mWW2mwCGvpgr -TOKEN_EXPIRATION=30 -CFG_EXPIRATION=5 -GODEBUG=netdns=cgo -ADMIRAL_URL=NA -WITH_NOTARY=False -WITH_CLAIR=False -CLAIR_DB_PASSWORD=root123 -CLAIR_DB_HOST=postgresql -CLAIR_DB_PORT=5432 -CLAIR_DB_USERNAME=postgres -CLAIR_DB=postgres -RESET=false -UAA_ENDPOINT=uaa.mydomain.org -UAA_CLIENTID=id -UAA_CLIENTSECRET=secret -UAA_VERIFY_CERT=true -UI_URL=http://ui:8080 -JOBSERVICE_URL=http://jobservice:8080 -CLAIR_URL=http://clair:6060 -NOTARY_URL=http://notary-server:4443 -REGISTRY_STORAGE_PROVIDER_NAME=filesystem -READ_ONLY=false -SKIP_RELOAD_ENV_PATTERN=$^ -RELOAD_KEY= -CHART_REPOSITORY_URL=http://chartmuseum:9999 -LDAP_GROUP_ADMIN_DN= -REGISTRY_CONTROLLER_URL=http://registryctl:8080 -WITH_CHARTMUSEUM=True diff --git a/harbor/tests/compose/harbor-1.6.0/config/chartserver/env b/harbor/tests/compose/harbor-1.6.0/config/chartserver/env deleted file mode 100644 index f95e7021794c2..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/config/chartserver/env +++ /dev/null @@ -1,41 +0,0 @@ -## Settings should be set -PORT=9999 - -# Only support redis now. If redis is setup, then enable cache -CACHE=redis -CACHE_REDIS_ADDR=redis:6379 -CACHE_REDIS_PASSWORD= -CACHE_REDIS_DB=3 - -# Credential for internal communication -BASIC_AUTH_USER=chart_controller -BASIC_AUTH_PASS=Cl0CiaW42NzV9Fbd - -# Multiple tenants -# Must be set with 1 to support project namespace -DEPTH=1 - -# Backend storage driver: e.g. "local", "amazon", "google" etc. -STORAGE=local - -# Storage driver settings -STORAGE_LOCAL_ROOTDIR=/chart_storage - -## Settings with default values. Just put here for future changes -DEBUG=false -LOG_JSON=true -DISABLE_METRICS=false -DISABLE_API=false -DISABLE_STATEFILES=false -ALLOW_OVERWRITE=true -CHART_URL= -AUTH_ANONYMOUS_GET=false -TLS_CERT= -TLS_KEY= -CONTEXT_PATH= -INDEX_LIMIT=0 -MAX_STORAGE_OBJECTS=0 -MAX_UPLOAD_SIZE=20971520 -CHART_POST_FORM_FIELD_NAME=chart -PROV_POST_FORM_FIELD_NAME=prov - diff --git a/harbor/tests/compose/harbor-1.6.0/config/db/env b/harbor/tests/compose/harbor-1.6.0/config/db/env deleted file mode 100644 index 95939bc7b97c3..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/config/db/env +++ /dev/null @@ -1 +0,0 @@ -POSTGRES_PASSWORD=root123 diff --git a/harbor/tests/compose/harbor-1.6.0/config/jobservice/config.yml b/harbor/tests/compose/harbor-1.6.0/config/jobservice/config.yml deleted file mode 100644 index fadc6c6c80ea5..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/config/jobservice/config.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -#Protocol used to serve -protocol: "http" - -#Config certification if use 'https' protocol -#https_config: -# cert: "server.crt" -# key: "server.key" - -#Server listening port -port: 8080 - -#Worker pool -worker_pool: - #Worker concurrency - workers: 10 - backend: "redis" - #Additional config if use 'redis' backend - redis_pool: - #redis://[arbitrary_username:password@]ipaddress:port/database_index - redis_url: redis://redis:6379/2 - namespace: "harbor_job_service_namespace" -#Logger for job -logger: - path: "/var/log/jobs" - level: "INFO" - archive_period: 14 #days -#Admin server endpoint -admin_server: "http://adminserver:8080/" diff --git a/harbor/tests/compose/harbor-1.6.0/config/jobservice/env b/harbor/tests/compose/harbor-1.6.0/config/jobservice/env deleted file mode 100644 index ae5aa145eff61..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/config/jobservice/env +++ /dev/null @@ -1,4 +0,0 @@ -UI_SECRET=Cl0CiaW42NzV9Fbd -JOBSERVICE_SECRET=3AD4mWW2mwCGvpgr -ADMINSERVER_URL=http://adminserver:8080 -GODEBUG=netdns=cgo diff --git a/harbor/tests/compose/harbor-1.6.0/config/nginx/nginx.conf b/harbor/tests/compose/harbor-1.6.0/config/nginx/nginx.conf deleted file mode 100644 index 1b0c1cf2db606..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/config/nginx/nginx.conf +++ /dev/null @@ -1,78 +0,0 @@ -worker_processes auto; - -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - -http { - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream ui { - server ui:8080; - } - - log_format timed_combined '$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - server { - listen 80; - server_tokens off; - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - location / { - proxy_pass http://ui/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass http://ui/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass http://ui/service/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } -} diff --git a/harbor/tests/compose/harbor-1.6.0/config/registry/config.yml b/harbor/tests/compose/harbor-1.6.0/config/registry/config.yml deleted file mode 100644 index ac21480a642cb..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/config/registry/config.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: 0.1 -log: - level: info - fields: - service: registry -storage: - cache: - layerinfo: redis - filesystem: - rootdirectory: /storage - maintenance: - uploadpurging: - enabled: false - delete: - enabled: true -redis: - addr: redis:6379 - password: - db: 1 -http: - addr: :5000 - secret: placeholder - debug: - addr: localhost:5001 -auth: - token: - issuer: harbor-token-issuer - realm: http://localhost/service/token - rootcertbundle: /etc/registry/root.crt - service: harbor-registry -notifications: - endpoints: - - name: harbor - disabled: false - url: http://ui:8080/service/notifications - timeout: 3000ms - threshold: 5 - backoff: 1s diff --git a/harbor/tests/compose/harbor-1.6.0/config/registryctl/config.yml b/harbor/tests/compose/harbor-1.6.0/config/registryctl/config.yml deleted file mode 100644 index 7b2a1d9102edb..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/config/registryctl/config.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -protocol: "http" -port: 8080 -log_level: "INFO" - -#https_config: -# cert: "server.crt" -# key: "server.key" \ No newline at end of file diff --git a/harbor/tests/compose/harbor-1.6.0/config/registryctl/env b/harbor/tests/compose/harbor-1.6.0/config/registryctl/env deleted file mode 100644 index 0b4450ab5b366..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/config/registryctl/env +++ /dev/null @@ -1,3 +0,0 @@ -UI_SECRET=Cl0CiaW42NzV9Fbd -JOBSERVICE_SECRET=3AD4mWW2mwCGvpgr - diff --git a/harbor/tests/compose/harbor-1.6.0/config/ui/app.conf b/harbor/tests/compose/harbor-1.6.0/config/ui/app.conf deleted file mode 100644 index 6110364ca0440..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/config/ui/app.conf +++ /dev/null @@ -1,6 +0,0 @@ -appname = Harbor -runmode = dev -enablegzip = true - -[dev] -httpport = 8080 diff --git a/harbor/tests/compose/harbor-1.6.0/config/ui/env b/harbor/tests/compose/harbor-1.6.0/config/ui/env deleted file mode 100644 index d0b3918c1d4ae..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/config/ui/env +++ /dev/null @@ -1,10 +0,0 @@ -LOG_LEVEL=info -CONFIG_PATH=/etc/ui/app.conf -UI_SECRET=Cl0CiaW42NzV9Fbd -JOBSERVICE_SECRET=3AD4mWW2mwCGvpgr -GODEBUG=netdns=cgo -ADMINSERVER_URL=http://adminserver:8080 -UAA_CA_ROOT=/etc/ui/certificates/uaa_ca.pem -_REDIS_URL=redis:6379,100, -SYNC_REGISTRY=false -CHART_CACHE_DRIVER=redis diff --git a/harbor/tests/compose/harbor-1.6.0/config/ui/private_key.pem b/harbor/tests/compose/harbor-1.6.0/config/ui/private_key.pem deleted file mode 100644 index f299b1af03cd0..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/config/ui/private_key.pem +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/harbor/tests/compose/harbor-1.6.0/docker-compose.yml b/harbor/tests/compose/harbor-1.6.0/docker-compose.yml deleted file mode 100644 index d46842fd8cfae..0000000000000 --- a/harbor/tests/compose/harbor-1.6.0/docker-compose.yml +++ /dev/null @@ -1,105 +0,0 @@ -version: '2' -services: - registry: - image: goharbor/registry-photon:v2.6.2-v1.6.3 - container_name: registry - restart: always - volumes: - - registry_storage:/storage:z - - ./config/registry/config.yml:/etc/registry/config.yml:z - - ../common/root.crt:/etc/registry/root.crt:z - networks: - - harbor - environment: - - GODEBUG=netdns=cgo - postgresql: - image: goharbor/harbor-db:v1.6.3 - container_name: harbor-db - restart: always - networks: - - harbor - env_file: - - ./config/db/env - adminserver: - image: goharbor/harbor-adminserver:v1.6.3 - container_name: harbor-adminserver - env_file: - - ./config/adminserver/env - restart: always - volumes: - - ../common/secretkey:/etc/adminserver/key:z - networks: - - harbor - ui: - image: goharbor/harbor-ui:v1.6.3 - container_name: harbor-ui - env_file: - - ./config/ui/env - restart: always - volumes: - - ./config/ui/app.conf:/etc/ui/app.conf:z - - ./config/ui/private_key.pem:/etc/ui/private_key.pem:z - - ../common/secretkey:/etc/ui/key:z - networks: - - harbor - - harbor-chartmuseum - depends_on: - - adminserver - - registry - jobservice: - image: goharbor/harbor-jobservice:v1.6.3 - container_name: harbor-jobservice - env_file: - - ./config/jobservice/env - restart: always - volumes: - - jobs_logs:/var/log/jobs:z - - ./config/jobservice/config.yml:/etc/jobservice/config.yml:z - networks: - - harbor - depends_on: - - redis - - ui - - adminserver - redis: - image: goharbor/redis-photon:v1.6.3 - container_name: redis - restart: always - networks: - - harbor - - harbor-chartmuseum - proxy: - image: goharbor/nginx-photon:v1.6.3 - container_name: nginx - restart: always - volumes: - - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:z - networks: - - harbor - ports: - - 80:80 - - 443:443 - - 4443:4443 - depends_on: - - postgresql - - registry - - ui - chartmuseum: - container_name: chartmuseum - image: goharbor/chartmuseum-photon:v0.7.1-v1.6.2 - restart: always - networks: - - harbor-chartmuseum - depends_on: - - redis - env_file: - ./config/chartserver/env -networks: - harbor: - external: false - harbor-chartmuseum: - external: false -volumes: - registry_storage: - jobs_logs: - diff --git a/harbor/tests/compose/harbor-1.7.0/config/adminserver/env b/harbor/tests/compose/harbor-1.7.0/config/adminserver/env deleted file mode 100644 index f753a5086c998..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/config/adminserver/env +++ /dev/null @@ -1,68 +0,0 @@ -PORT=8080 -LOG_LEVEL=info -EXT_ENDPOINT=https://127.0.0.1 -AUTH_MODE=db_auth -SELF_REGISTRATION=on -LDAP_URL=ldaps://ldap.mydomain.com -LDAP_SEARCH_DN= -LDAP_SEARCH_PWD= -LDAP_BASE_DN=ou=people,dc=mydomain,dc=com -LDAP_FILTER= -LDAP_UID=uid -LDAP_SCOPE=2 -LDAP_TIMEOUT=5 -LDAP_VERIFY_CERT=true -DATABASE_TYPE=postgresql -POSTGRESQL_HOST=postgresql -POSTGRESQL_PORT=5432 -POSTGRESQL_USERNAME=postgres -POSTGRESQL_PASSWORD=root123 -POSTGRESQL_DATABASE=registry -POSTGRESQL_SSLMODE=disable -LDAP_GROUP_BASEDN=ou=group,dc=mydomain,dc=com -LDAP_GROUP_FILTER=objectclass=group -LDAP_GROUP_GID=cn -LDAP_GROUP_SCOPE=2 -REGISTRY_URL=http://registry:5000 -TOKEN_SERVICE_URL=http://core:8080/service/token -EMAIL_HOST=smtp.mydomain.com -EMAIL_PORT=25 -EMAIL_USR=sample_admin@mydomain.com -EMAIL_PWD=abc -EMAIL_SSL=false -EMAIL_FROM=admin -EMAIL_IDENTITY= -EMAIL_INSECURE=false -HARBOR_ADMIN_PASSWORD=Harbor12345 -PROJECT_CREATION_RESTRICTION=everyone -MAX_JOB_WORKERS=10 -CORE_SECRET=y0XyyJ3GKKVNTQOx -JOBSERVICE_SECRET=gr0OUESFTDTyp3DT -TOKEN_EXPIRATION=30 -CFG_EXPIRATION=5 -ADMIRAL_URL=NA -WITH_NOTARY=False -WITH_CLAIR=False -CLAIR_DB_PASSWORD=root123 -CLAIR_DB_HOST=postgresql -CLAIR_DB_PORT=5432 -CLAIR_DB_USERNAME=postgres -CLAIR_DB=postgres -CLAIR_DB_SSLMODE=disable -RESET=false -UAA_ENDPOINT=uaa.mydomain.org -UAA_CLIENTID=id -UAA_CLIENTSECRET=secret -UAA_VERIFY_CERT=true -CORE_URL=http://core:8080 -JOBSERVICE_URL=http://jobservice:8080 -CLAIR_URL=http://clair:6060 -NOTARY_URL=http://notary-server:4443 -REGISTRY_STORAGE_PROVIDER_NAME=filesystem -READ_ONLY=false -SKIP_RELOAD_ENV_PATTERN=$^ -RELOAD_KEY= -CHART_REPOSITORY_URL=http://chartmuseum:9999 -LDAP_GROUP_ADMIN_DN= -REGISTRY_CONTROLLER_URL=http://registryctl:8080 -WITH_CHARTMUSEUM=True diff --git a/harbor/tests/compose/harbor-1.7.0/config/chartserver/env b/harbor/tests/compose/harbor-1.7.0/config/chartserver/env deleted file mode 100644 index 3e042b0e31fc2..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/config/chartserver/env +++ /dev/null @@ -1,41 +0,0 @@ -## Settings should be set -PORT=9999 - -# Only support redis now. If redis is setup, then enable cache -CACHE=redis -CACHE_REDIS_ADDR=redis:6379 -CACHE_REDIS_PASSWORD= -CACHE_REDIS_DB=3 - -# Credential for internal communication -BASIC_AUTH_USER=chart_controller -BASIC_AUTH_PASS=y0XyyJ3GKKVNTQOx - -# Multiple tenants -# Must be set with 1 to support project namespace -DEPTH=1 - -# Backend storage driver: e.g. "local", "amazon", "google" etc. -STORAGE=local - -# Storage driver settings -STORAGE_LOCAL_ROOTDIR=/chart_storage - -## Settings with default values. Just put here for future changes -DEBUG=false -LOG_JSON=true -DISABLE_METRICS=false -DISABLE_API=false -DISABLE_STATEFILES=false -ALLOW_OVERWRITE=true -CHART_URL= -AUTH_ANONYMOUS_GET=false -TLS_CERT= -TLS_KEY= -CONTEXT_PATH= -INDEX_LIMIT=0 -MAX_STORAGE_OBJECTS=0 -MAX_UPLOAD_SIZE=20971520 -CHART_POST_FORM_FIELD_NAME=chart -PROV_POST_FORM_FIELD_NAME=prov - diff --git a/harbor/tests/compose/harbor-1.7.0/config/core/app.conf b/harbor/tests/compose/harbor-1.7.0/config/core/app.conf deleted file mode 100644 index 6110364ca0440..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/config/core/app.conf +++ /dev/null @@ -1,6 +0,0 @@ -appname = Harbor -runmode = dev -enablegzip = true - -[dev] -httpport = 8080 diff --git a/harbor/tests/compose/harbor-1.7.0/config/core/env b/harbor/tests/compose/harbor-1.7.0/config/core/env deleted file mode 100644 index 6484fa917bed4..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/config/core/env +++ /dev/null @@ -1,11 +0,0 @@ -LOG_LEVEL=info -CONFIG_PATH=/etc/core/app.conf -CORE_SECRET=y0XyyJ3GKKVNTQOx -JOBSERVICE_SECRET=gr0OUESFTDTyp3DT -ADMINSERVER_URL=http://adminserver:8080 -UAA_CA_ROOT=/etc/core/certificates/uaa_ca.pem -_REDIS_URL=redis:6379,100, -SYNC_REGISTRY=false -CHART_CACHE_DRIVER=redis -_REDIS_URL_REG=redis://redis:6379/1 - diff --git a/harbor/tests/compose/harbor-1.7.0/config/core/private_key.pem b/harbor/tests/compose/harbor-1.7.0/config/core/private_key.pem deleted file mode 100644 index d885545265d28..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/config/core/private_key.pem +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEA6OLAOQQt9DYTb6WPOLkIHQyv4zV9zSxy3AFo3UqUiI/gSnpI -BEax+ImNQ/yrL1w+Htlv9Ed3UP/ByxCXE7BQp1ao93eMyUZ1lwpv0ULskKwFXo4t -YIr3uP8z5j63nDrNgRc0tGxeDOpnr0lVo40NHKYh6qd9bJ8cQFWbfyvRYCYi8296 -CmVSlxsXkiAzlMXNKq+TjKYTrmZLFQ9W7gBgrbPGboJxXrqwd9RPAKUtXbcVfNI5 -36H35Ax6jLY0fuq0FQBObDuIWOrkLQwtpyMLu5DgQnO58hwn5ykWLfGfU9aIRdrz -NUInC7YVCWxqkrfja7q4G19YfzMeRjyh3hXsB+29Hu4K75YeW+nxn4tqZk0/w6PE -3o2/7ZEqS4F4F+MWKNRi8xZqpLvh3j/PW/llvlHavVXbYr9YMg81rGXH6KHGv4Aa -EcJhVfsxq9CAkXwEGoYpt4Hbi3Ilzx8apwOzashrcSwGPKDpWpzDa0sddyoBUPt7 -2rB9PbmHROsIC7cRfdd2c6H+K45RoBLlTQraBasObtAVIg1M0BNnjysP1MvLmlqa -SkyoMzJ5J+lHTRQoSQlBBA/Lzz+C1advSEih0WsjjBYdqgz5oAHjiDmsrUtVm+h0 -FSO6gjGMOv2IG9k2Sp4PEs49ckTV0fExe+FVepjEkK+zF3kDq7yrDPgpE/kCAwEA -AQKCAgBGsmc2J82ngC8ASpsi1hDfeLWAXQG2olKv9QGXhAd5OWwWT+7C1Y87as5m -oDJ7ax40kT+KQZO4FBwJgBzMzk59rjIXBcTIaUpTMsjlFtLnzEDJBpJB543yLA7e -S5XDqJowIRJP30Hh29rj/Hgx8STU2J4dNQE/U0HpSdOtlGi4LnuXuPSsaTvcQU4z -fvEJrc5tseUx4kzBOa57Uy/JinXO5W9Mpu6xmizuA5aEFKCj/WtZfBwzhmDRavRc -+QcQrEFEytYDx0LJ82yXPEYzodDy/LUHl0gQdnmqk+92vQ3oDo1J34DLXyypQno6 -ZR4pMgeo8YLoVFZyLtt26PsehzsiTMB6JupIO+TmoJ7WO91/baBzwC5HxFxOi7iV -6bVCO/mtmSJ5GmtryhYSp2tCOfhhedO7lGlCdAcfLwKW1JngUMh2R5COCw/bN1/q -7Qv6SdwevyG2U6sjNFFSSP8gVWQ1d7obTkqKV+pi2l8XCScBISOTOqANnT0FnMMr -AjBaliJfM+z+iW1LRzeoMzBVQYGUbJPoEIY84aqKVMKzZEBn7JgSxjLrm7EgAXl0 -VIse7JNn2pZHni9JYAEwVD9gzY5tHgSD+jN5s1xTV8xoSmt2PP2jGc+FWhvZezBG -MEgR8qDgmakO0yC3/qRMGuQzt/zoI/Cc98NIsy5NYZI3y/dPPQKCAQEA+hTnW8P0 -TO4FvaimUmqZJ3UvuhwP2pzvPCARzxQxpOHEoGFREA1+14dDuCK15ifjeDjdre34 -D4BaTVexlYQQCa3RiAZjz15tnjtSaleGhYnlOLwqkq9GQXZttdflFBI9/IfxAzNS -r2NhDeB01v+PNe+2n/3jOp8J4k3W2CKrCDNQOzYFjvW6UpE4ho2sR6CMXP6dCeji -N+u/WtcT59DjGdyruZ3ZBORF8UCWo63uu3+qOQlPmz28E7I1JhJQl1ue8Kb9fseK -7wdTPg3cn13snfC2LdrN8cGO4hB+1FY20u+BeZBAjEV5FQHOv0oUaud8NX3+2Jg1 -rb9PtZGsYm/LgwKCAQEA7mWq1XqasyN2XGQPxTu4xtSO4uC3tcYKGwtPm0PY2Egp -ViShLU6kwnMeooRqnHqpRM2yAAIE+mCikvEq1TJzQO94MSWIJjm7lMEZcqFWV9Cu -6RSxtHB+5TJ+Pkcg1ylQxmMH0SV2wpYCwvZZT9e5CVRrYBhSn5BEAVEijK7IlRGo -K4Q5Ib4mGyViORhg02aw+xZph0xPYPYB3jBOs/SUi/yoNs6Vw8yT4cN2XafWqW/b -Jj+TxAa2wKwkpkVkvu/FH9BJRvxOqin0sqWVR5+4PkWDIcaR3tHZ6ND2/0GXEFqj -LSWUHi1OzYrCwHWo9L4N0WY86Nibr4L903Q0Yeed0wKCAQAcMws7n8cGfbiMAF5w -4LBQcLhnBg8LmbKoVv1rGl3Wt9aSNycK5lqtNwV91/wm7cyKm+7zU+gq51BHdGID -+BZO4RjFe+L5WS6HLy1F7ISwvjHoyd8LF1SWwSHx5VxhfQUcWr/kmn7yZARnqi3C -qKKfdF5lgB2FWLWmnRxi1tXuYMrlQlwyGKdf9BwpoAQTN5lcSyGuImKP57d2KNaH -x1g0bFu43IHCOXNhluTlpBFNd0HcmJ4vZTC2D9xKZLpNtvkfLdVb3GhgN7U9RBbi -qZaq4J/KX+flIOxZtX53txkLhBJXgNqmdpcGtWN40oOm4l9xMLnx9ofnBbGZScnk -d7K9AoIBAAbtDTmGhlgN/7JPdeXVBllAc6ZDwRKW3lRKz9VC81nVPt4x0jzuu/qq -PYmbLz28ko5dK360kFB13kNGnmfzP0Xzrxo+bOYvZzO7KHIcHdYPSgWbhE4ptoYS -IXjNuDaIDMC2v9Njsz+T/CCN56paKhYLTdNM4ZmhJ1iics6DhXBPQwOAo+hHDfRb -8a6W9rktkpa43/f+T5ARlZxO6vpvcKFghcKR3egCWYmFlDrEVYg2p7dEwZZAW67d -UXNDMNobPS7fbkGRsvdeoK1QAjZCfafRfS3OBw7iKeKJr6Na1Hi1KWh2XwdBabiu -/1l4EaCKpPwgbESXhm5i79zk02DEyeECggEBAMpUIQwI7D7CxKPD93neS4ANsZ2y -aeGN/A5witz3VGosE609eZkrb7mQ0y/K/QfIwOzkoFmTrtCWjsZ27eFZQCZutrfn -9E3WDghM3YZpEtZN0azdnsCmYEby6ySh9na1xcksMJsCXUYCdRdVt2OjqJA/Kpdj -PoNj5JhdENXnbPQnD6A8M7i2QYYxNRJ4CiTESvaIIJsEf/G+VjzSkjQVUPwcbJSo -lkYMWJicK/GWzrhcF/65bgmDOnOhJEuQKX6atL7c9MitLn/r4dYsK0C7JayCfsYi -+5V09HHY2zWqyF6eQUsMvgWOKjiMvHVJ0HHnxrMZgkXXvcz2eSmeuFlhwCE= ------END RSA PRIVATE KEY----- diff --git a/harbor/tests/compose/harbor-1.7.0/config/db/env b/harbor/tests/compose/harbor-1.7.0/config/db/env deleted file mode 100644 index 95939bc7b97c3..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/config/db/env +++ /dev/null @@ -1 +0,0 @@ -POSTGRES_PASSWORD=root123 diff --git a/harbor/tests/compose/harbor-1.7.0/config/jobservice/config.yml b/harbor/tests/compose/harbor-1.7.0/config/jobservice/config.yml deleted file mode 100644 index a575ce71ffea3..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/config/jobservice/config.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -#Protocol used to serve -protocol: "http" - -#Config certification if use 'https' protocol -#https_config: -# cert: "server.crt" -# key: "server.key" - -#Server listening port -port: 8080 - -#Worker pool -worker_pool: - #Worker concurrency - workers: 10 - backend: "redis" - #Additional config if use 'redis' backend - redis_pool: - #redis://[arbitrary_username:password@]ipaddress:port/database_index - redis_url: redis://redis:6379/2 - namespace: "harbor_job_service_namespace" -#Loggers for the running job -job_loggers: - - name: "STD_OUTPUT" # logger backend name, only support "FILE" and "STD_OUTPUT" - level: "INFO" # INFO/DEBUG/WARNING/ERROR/FATAL - - name: "FILE" - level: "INFO" - settings: # Customized settings of logger - base_dir: "/var/log/jobs" - sweeper: - duration: 1 #days - settings: # Customized settings of sweeper - work_dir: "/var/log/jobs" - -#Loggers for the job service -loggers: - - name: "STD_OUTPUT" # Same with above - level: "INFO" -#Admin server endpoint -admin_server: "http://adminserver:8080/" diff --git a/harbor/tests/compose/harbor-1.7.0/config/jobservice/env b/harbor/tests/compose/harbor-1.7.0/config/jobservice/env deleted file mode 100644 index cd2479ad7f118..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/config/jobservice/env +++ /dev/null @@ -1,3 +0,0 @@ -CORE_SECRET=y0XyyJ3GKKVNTQOx -JOBSERVICE_SECRET=gr0OUESFTDTyp3DT -CORE_URL=http://core:8080 diff --git a/harbor/tests/compose/harbor-1.7.0/config/nginx/nginx.conf b/harbor/tests/compose/harbor-1.7.0/config/nginx/nginx.conf deleted file mode 100644 index 0d1daefc1bfc4..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/config/nginx/nginx.conf +++ /dev/null @@ -1,133 +0,0 @@ -worker_processes auto; - -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - -http { - tcp_nodelay on; - include /etc/nginx/conf.d/*.upstream.conf; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server core:8080; - } - - upstream portal { - server portal:80; - } - - log_format timed_combined '$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - include /etc/nginx/conf.d/*.server.conf; - - server { - listen 80; - - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - # costumized location config file can place to /etc/nginx dir with prefix harbor.https. and suffix .conf - include /etc/nginx/conf.d/harbor.https.*.conf; - - location / { - proxy_pass http://portal/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - # Add Secure flag when serving HTTPS - proxy_cookie_path / "/; secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass http://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass http://core/api/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass http://core/chartrepo/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass http://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass http://core/service/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } -} diff --git a/harbor/tests/compose/harbor-1.7.0/config/registry/config.yml b/harbor/tests/compose/harbor-1.7.0/config/registry/config.yml deleted file mode 100644 index 09dc21d1e73d9..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/config/registry/config.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: 0.1 -log: - level: info - fields: - service: registry -storage: - cache: - layerinfo: redis - filesystem: - rootdirectory: /storage - maintenance: - uploadpurging: - enabled: false - delete: - enabled: true -redis: - addr: redis:6379 - password: - db: 1 -http: - addr: :5000 - secret: placeholder - debug: - addr: localhost:5001 -auth: - token: - issuer: harbor-token-issuer - realm: https://127.0.0.1/service/token - rootcertbundle: /etc/registry/root.crt - service: harbor-registry -notifications: - endpoints: - - name: harbor - disabled: false - url: http://core:8080/service/notifications - timeout: 3000ms - threshold: 5 - backoff: 1s diff --git a/harbor/tests/compose/harbor-1.7.0/config/registryctl/config.yml b/harbor/tests/compose/harbor-1.7.0/config/registryctl/config.yml deleted file mode 100644 index 7b2a1d9102edb..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/config/registryctl/config.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -protocol: "http" -port: 8080 -log_level: "INFO" - -#https_config: -# cert: "server.crt" -# key: "server.key" \ No newline at end of file diff --git a/harbor/tests/compose/harbor-1.7.0/config/registryctl/env b/harbor/tests/compose/harbor-1.7.0/config/registryctl/env deleted file mode 100644 index e727b9d2c94f3..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/config/registryctl/env +++ /dev/null @@ -1,3 +0,0 @@ -CORE_SECRET=y0XyyJ3GKKVNTQOx -JOBSERVICE_SECRET=gr0OUESFTDTyp3DT - diff --git a/harbor/tests/compose/harbor-1.7.0/docker-compose.yml b/harbor/tests/compose/harbor-1.7.0/docker-compose.yml deleted file mode 100644 index 01858ac7532f5..0000000000000 --- a/harbor/tests/compose/harbor-1.7.0/docker-compose.yml +++ /dev/null @@ -1,193 +0,0 @@ -version: '2' -services: - registry: - image: goharbor/registry-photon:v2.6.2-v1.7.5 - container_name: registry - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID - volumes: - - registry_storage:/storage:z - - ./config/registry/config.yml:/etc/registry/config.yml:z - - ../common/root.crt:/etc/registry/root.crt:z - networks: - - harbor - dns_search: . - registryctl: - image: goharbor/harbor-registryctl:v1.7.5 - container_name: registryctl - env_file: - - ./config/registryctl/env - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID - volumes: - - registry_storage:/storage:z - - ./config/registry/config.yml:/etc/registry/config.yml:z - - ./config/registryctl/config.yml:/etc/registryctl/config.yml:z - networks: - - harbor - dns_search: . - postgresql: - image: goharbor/harbor-db:v1.7.5 - container_name: harbor-db - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - DAC_OVERRIDE - - SETGID - - SETUID - networks: - - harbor - dns_search: . - env_file: - - ./config/db/env - adminserver: - image: goharbor/harbor-adminserver:v1.7.5 - container_name: harbor-adminserver - env_file: - - ./config/adminserver/env - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID - volumes: - - ../common/secretkey:/etc/adminserver/key:z - depends_on: - - postgresql - networks: - - harbor - dns_search: . - core: - image: goharbor/harbor-core:v1.7.5 - container_name: harbor-core - env_file: - - ./config/core/env - restart: always - cap_drop: - - ALL - cap_add: - - SETGID - - SETUID - volumes: - - ./config/core/app.conf:/etc/core/app.conf:z - - ./config/core/private_key.pem:/etc/core/private_key.pem:z - - ../common/secretkey:/etc/core/key:z - networks: - - harbor - - harbor-chartmuseum - dns_search: . - depends_on: - - adminserver - - registry - portal: - image: goharbor/harbor-portal:v1.7.5 - container_name: harbor-portal - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID - - NET_BIND_SERVICE - networks: - - harbor - dns_search: . - depends_on: - - core - jobservice: - image: goharbor/harbor-jobservice:v1.7.5 - container_name: harbor-jobservice - env_file: - - ./config/jobservice/env - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID - volumes: - - ./config/jobservice/config.yml:/etc/jobservice/config.yml:z - networks: - - harbor - dns_search: . - depends_on: - - redis - - core - - adminserver - redis: - image: goharbor/redis-photon:v1.7.5 - container_name: redis - restart: always - volumes: - - redis_data:/var/lib/redis/:z - networks: - - harbor - - harbor-chartmuseum - dns_search: . - proxy: - image: goharbor/nginx-photon:v1.7.5 - container_name: nginx - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID - - NET_BIND_SERVICE - volumes: - - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:z - networks: - - harbor - dns_search: . - ports: - - 80:80 - - 443:443 - - 4443:4443 - depends_on: - - postgresql - - registry - - core - - portal - chartmuseum: - container_name: chartmuseum - image: goharbor/chartmuseum-photon:v0.8.1-v1.7.5 - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - DAC_OVERRIDE - - SETGID - - SETUID - networks: - - harbor-chartmuseum - dns_search: . - depends_on: - - redis - env_file: - ./config/chartserver/env -networks: - harbor: - external: false - harbor-chartmuseum: - external: false -volumes: - registry_storage: - redis_data: diff --git a/harbor/tests/compose/harbor-1.8.0/config/cert/server.crt b/harbor/tests/compose/harbor-1.8.0/config/cert/server.crt deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/harbor/tests/compose/harbor-1.8.0/config/cert/server.key b/harbor/tests/compose/harbor-1.8.0/config/cert/server.key deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/harbor/tests/compose/harbor-1.8.0/config/chartserver/env b/harbor/tests/compose/harbor-1.8.0/config/chartserver/env deleted file mode 100644 index 6b71fbe503701..0000000000000 --- a/harbor/tests/compose/harbor-1.8.0/config/chartserver/env +++ /dev/null @@ -1,40 +0,0 @@ -## Settings should be set -PORT=9999 - -# Only support redis now. If redis is setup, then enable cache -CACHE=redis -CACHE_REDIS_ADDR=redis:6379 -CACHE_REDIS_PASSWORD= -CACHE_REDIS_DB=3 - -# Credential for internal communication -BASIC_AUTH_USER=chart_controller -BASIC_AUTH_PASS=BT0VuY9rVQP5GZTr - -# Multiple tenants -# Must be set with 1 to support project namespace -DEPTH=1 - -# Backend storage driver: e.g. "local", "amazon", "google" etc. -STORAGE=local - -# Storage driver settings -STORAGE_LOCAL_ROOTDIR=/chart_storage - -## Settings with default values. Just put here for future changes -DEBUG=false -LOG_JSON=true -DISABLE_METRICS=false -DISABLE_API=false -DISABLE_STATEFILES=false -ALLOW_OVERWRITE=true -CHART_URL=https://127.0.0.1/chartrepo -AUTH_ANONYMOUS_GET=false -TLS_CERT= -TLS_KEY= -CONTEXT_PATH= -INDEX_LIMIT=0 -MAX_STORAGE_OBJECTS=0 -MAX_UPLOAD_SIZE=20971520 -CHART_POST_FORM_FIELD_NAME=chart -PROV_POST_FORM_FIELD_NAME=prov diff --git a/harbor/tests/compose/harbor-1.8.0/config/core/app.conf b/harbor/tests/compose/harbor-1.8.0/config/core/app.conf deleted file mode 100644 index 6110364ca0440..0000000000000 --- a/harbor/tests/compose/harbor-1.8.0/config/core/app.conf +++ /dev/null @@ -1,6 +0,0 @@ -appname = Harbor -runmode = dev -enablegzip = true - -[dev] -httpport = 8080 diff --git a/harbor/tests/compose/harbor-1.8.0/config/core/env b/harbor/tests/compose/harbor-1.8.0/config/core/env deleted file mode 100644 index b395a4c91f6ce..0000000000000 --- a/harbor/tests/compose/harbor-1.8.0/config/core/env +++ /dev/null @@ -1,42 +0,0 @@ -CONFIG_PATH=/etc/core/app.conf -UAA_CA_ROOT=/etc/core/certificates/uaa_ca.pem -_REDIS_URL=redis:6379,100, -SYNC_REGISTRY=false -CHART_CACHE_DRIVER=redis -_REDIS_URL_REG=redis://redis:6379/1 - -PORT=8080 -LOG_LEVEL=info -EXT_ENDPOINT=https://127.0.0.1 -DATABASE_TYPE=postgresql -POSTGRESQL_HOST=postgresql -POSTGRESQL_PORT=5432 -POSTGRESQL_USERNAME=postgres -POSTGRESQL_PASSWORD=root123 -POSTGRESQL_DATABASE=registry -POSTGRESQL_SSLMODE=disable -REGISTRY_URL=http://registry:5000 -TOKEN_SERVICE_URL=http://core:8080/service/token -HARBOR_ADMIN_PASSWORD=Harbor12345 -MAX_JOB_WORKERS=10 -CORE_SECRET=BT0VuY9rVQP5GZTr -JOBSERVICE_SECRET=lK1ZtNj831qeBwMd -ADMIRAL_URL= -WITH_NOTARY=False -WITH_CLAIR=False -CLAIR_DB_PASSWORD=root123 -CLAIR_DB_HOST=postgresql -CLAIR_DB_PORT=5432 -CLAIR_DB_USERNAME=postgres -CLAIR_DB=postgres -CLAIR_DB_SSLMODE=disable -CORE_URL=http://core:8080 -JOBSERVICE_URL=http://jobservice:8080 -CLAIR_URL=http://clair:6060 -NOTARY_URL=http://notary-server:4443 -REGISTRY_STORAGE_PROVIDER_NAME=filesystem -READ_ONLY=false -RELOAD_KEY= -CHART_REPOSITORY_URL=http://chartmuseum:9999 -REGISTRY_CONTROLLER_URL=http://registryctl:8080 -WITH_CHARTMUSEUM=True \ No newline at end of file diff --git a/harbor/tests/compose/harbor-1.8.0/config/core/private_key.pem b/harbor/tests/compose/harbor-1.8.0/config/core/private_key.pem deleted file mode 100644 index 419f113c8ac1f..0000000000000 --- a/harbor/tests/compose/harbor-1.8.0/config/core/private_key.pem +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/harbor/tests/compose/harbor-1.8.0/config/db/env b/harbor/tests/compose/harbor-1.8.0/config/db/env deleted file mode 100644 index 1f140a432a3ef..0000000000000 --- a/harbor/tests/compose/harbor-1.8.0/config/db/env +++ /dev/null @@ -1 +0,0 @@ -POSTGRES_PASSWORD=root123 \ No newline at end of file diff --git a/harbor/tests/compose/harbor-1.8.0/config/jobservice/config.yml b/harbor/tests/compose/harbor-1.8.0/config/jobservice/config.yml deleted file mode 100644 index ee00ceb3f5600..0000000000000 --- a/harbor/tests/compose/harbor-1.8.0/config/jobservice/config.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -#Protocol used to serve -protocol: "http" - -#Config certification if use 'https' protocol -#https_config: -# cert: "server.crt" -# key: "server.key" - -#Server listening port -port: 8080 - -#Worker pool -worker_pool: - #Worker concurrency - workers: 10 - backend: "redis" - #Additional config if use 'redis' backend - redis_pool: - #redis://[arbitrary_username:password@]ipaddress:port/database_index - redis_url: redis://redis:6379/2 - namespace: "harbor_job_service_namespace" -#Loggers for the running job -job_loggers: - - name: "STD_OUTPUT" # logger backend name, only support "FILE" and "STD_OUTPUT" - level: "INFO" # INFO/DEBUG/WARNING/ERROR/FATAL - - name: "FILE" - level: "INFO" - settings: # Customized settings of logger - base_dir: "/var/log/jobs" - sweeper: - duration: 1 #days - settings: # Customized settings of sweeper - work_dir: "/var/log/jobs" - -#Loggers for the job service -loggers: - - name: "STD_OUTPUT" # Same with above - level: "INFO" \ No newline at end of file diff --git a/harbor/tests/compose/harbor-1.8.0/config/jobservice/env b/harbor/tests/compose/harbor-1.8.0/config/jobservice/env deleted file mode 100644 index 4d52e5ac53179..0000000000000 --- a/harbor/tests/compose/harbor-1.8.0/config/jobservice/env +++ /dev/null @@ -1,3 +0,0 @@ -CORE_SECRET=BT0VuY9rVQP5GZTr -JOBSERVICE_SECRET=lK1ZtNj831qeBwMd -CORE_URL=http://core:8080 \ No newline at end of file diff --git a/harbor/tests/compose/harbor-1.8.0/config/nginx/nginx.conf b/harbor/tests/compose/harbor-1.8.0/config/nginx/nginx.conf deleted file mode 100644 index 0e794780bd2f8..0000000000000 --- a/harbor/tests/compose/harbor-1.8.0/config/nginx/nginx.conf +++ /dev/null @@ -1,135 +0,0 @@ -worker_processes auto; - -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - -http { - tcp_nodelay on; - include /etc/nginx/conf.d/*.upstream.conf; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server core:8080; - } - - upstream portal { - server portal:80; - } - - log_format timed_combined '$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - include /etc/nginx/conf.d/*.server.conf; - - server { - listen 80; -# server_name harbordomain.com; - server_tokens off; - - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - # costumized location config file can place to /etc/nginx dir with prefix harbor.https. and suffix .conf - include /etc/nginx/conf.d/harbor.https.*.conf; - - location / { - proxy_pass http://portal/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - # Add Secure flag when serving HTTPS - proxy_cookie_path / "/; secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass http://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass http://core/api/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass http://core/chartrepo/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass http://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass http://core/service/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # When setting up Harbor behind other proxy, such as an Nginx instance, remove the below line if the proxy already has similar settings. - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } -} \ No newline at end of file diff --git a/harbor/tests/compose/harbor-1.8.0/config/registry/config.yml b/harbor/tests/compose/harbor-1.8.0/config/registry/config.yml deleted file mode 100644 index e4dc35e69315e..0000000000000 --- a/harbor/tests/compose/harbor-1.8.0/config/registry/config.yml +++ /dev/null @@ -1,43 +0,0 @@ -version: 0.1 -log: - level: info - fields: - service: registry -storage: - cache: - layerinfo: redis - filesystem: - rootdirectory: /storage - maintenance: - uploadpurging: - enabled: false - delete: - enabled: true -redis: - addr: redis:6379 - password: - db: 1 -http: - addr: :5000 - secret: placeholder - debug: - addr: localhost:5001 -auth: - token: - issuer: harbor-token-issuer - realm: https://127.0.0.1/service/token - rootcertbundle: /etc/registry/root.crt - service: harbor-registry -validation: - disabled: true -notifications: - endpoints: - - name: harbor - disabled: false - url: http://core:8080/service/notifications - timeout: 3000ms - threshold: 5 - backoff: 1s -compatibility: - schema1: - enabled: true \ No newline at end of file diff --git a/harbor/tests/compose/harbor-1.8.0/config/registryctl/config.yml b/harbor/tests/compose/harbor-1.8.0/config/registryctl/config.yml deleted file mode 100644 index 7b2a1d9102edb..0000000000000 --- a/harbor/tests/compose/harbor-1.8.0/config/registryctl/config.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -protocol: "http" -port: 8080 -log_level: "INFO" - -#https_config: -# cert: "server.crt" -# key: "server.key" \ No newline at end of file diff --git a/harbor/tests/compose/harbor-1.8.0/config/registryctl/env b/harbor/tests/compose/harbor-1.8.0/config/registryctl/env deleted file mode 100644 index d23cd2257ce34..0000000000000 --- a/harbor/tests/compose/harbor-1.8.0/config/registryctl/env +++ /dev/null @@ -1,2 +0,0 @@ -CORE_SECRET=BT0VuY9rVQP5GZTr -JOBSERVICE_SECRET=lK1ZtNj831qeBwMd diff --git a/harbor/tests/compose/harbor-1.8.0/docker-compose.yml b/harbor/tests/compose/harbor-1.8.0/docker-compose.yml deleted file mode 100644 index 3c8d97b9a2887..0000000000000 --- a/harbor/tests/compose/harbor-1.8.0/docker-compose.yml +++ /dev/null @@ -1,183 +0,0 @@ -version: '2.3' -services: - registry: - image: goharbor/registry-photon:v2.7.1-patch-2819-v1.8.0 - container_name: registry - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID - volumes: - - ./config/registry/config.yml:/etc/registry/config.yml:z - - type: bind - source: ../common/root.crt - target: /etc/registry/root.crt - networks: - - harbor - dns_search: . - registryctl: - image: goharbor/harbor-registryctl:v1.8.0 - container_name: registryctl - env_file: - - ./config/registryctl/env - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID - volumes: - - ./config/registry/config.yml:/etc/registry/config.yml:z - - type: bind - source: ./config/registryctl/config.yml - target: /etc/registryctl/config.yml - networks: - - harbor - dns_search: . - postgresql: - image: goharbor/harbor-db:v1.8.0 - container_name: harbor-db - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - DAC_OVERRIDE - - SETGID - - SETUID - networks: - harbor: - dns_search: . - env_file: - - ./config/db/env - core: - image: goharbor/harbor-core:v1.8.0 - container_name: harbor-core - env_file: - - ./config/core/env - restart: always - cap_drop: - - ALL - cap_add: - - SETGID - - SETUID - volumes: - - type: bind - source: ./config/core/app.conf - target: /etc/core/app.conf - - type: bind - source: ./config/core/private_key.pem - target: /etc/core/private_key.pem - - type: bind - source: ../common/secretkey - target: /etc/core/key - networks: - harbor: - harbor-chartmuseum: - aliases: - - harbor-core - dns_search: . - depends_on: - - registry - portal: - image: goharbor/harbor-portal:v1.8.0 - container_name: harbor-portal - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID - - NET_BIND_SERVICE - networks: - - harbor - dns_search: . - depends_on: - - core - - jobservice: - image: goharbor/harbor-jobservice:v1.8.0 - container_name: harbor-jobservice - env_file: - - ./config/jobservice/env - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID - volumes: - - type: bind - source: ./config/jobservice/config.yml - target: /etc/jobservice/config.yml - networks: - - harbor - dns_search: . - depends_on: - - redis - - core - redis: - image: goharbor/redis-photon:v1.8.0 - container_name: redis - restart: always - networks: - harbor: - harbor-chartmuseum: - aliases: - - redis - dns_search: . - proxy: - image: goharbor/nginx-photon:v1.8.0 - container_name: nginx - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - SETGID - - SETUID - - NET_BIND_SERVICE - volumes: - - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:z - networks: - - harbor - dns_search: . - ports: - - 80:80 - - 443:443 - depends_on: - - postgresql - - registry - - core - - portal - chartmuseum: - container_name: chartmuseum - image: goharbor/chartmuseum-photon:v0.8.1-v1.8.0 - restart: always - cap_drop: - - ALL - cap_add: - - CHOWN - - DAC_OVERRIDE - - SETGID - - SETUID - networks: - - harbor-chartmuseum - dns_search: . - depends_on: - - redis - env_file: - ./config/chartserver/env -networks: - harbor: - external: false - harbor-chartmuseum: - external: false -volumes: - registry_storage: diff --git a/harbor/tests/compose/harbor-2.0.5/docker-compose.yml b/harbor/tests/compose/harbor-2.0.5/docker-compose.yml index 0479fedbffae1..997aa131086d3 100644 --- a/harbor/tests/compose/harbor-2.0.5/docker-compose.yml +++ b/harbor/tests/compose/harbor-2.0.5/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2.3' +version: '3.8' services: registry: image: goharbor/registry-photon:v2.0.5 @@ -47,7 +47,7 @@ services: - SETGID - SETUID networks: - harbor: + - harbor dns_search: . env_file: - ./config/db/env diff --git a/harbor/tox.ini b/harbor/tox.ini index b5b5bbaa17be8..d8cad5e6a4c9a 100644 --- a/harbor/tox.ini +++ b/harbor/tox.ini @@ -4,7 +4,7 @@ minversion = 2.0 skip_missing_interpreters = true basepython = py38 envlist = - py{27,38}-{1.8,1.10,2.0} + py{27,38}-{1.10,2.0} [testenv] ensure_default_envdir = true @@ -26,7 +26,6 @@ passenv = commands = pytest -v {posargs} setenv = - 1.8: HARBOR_VERSION=1.8.0 1.10: HARBOR_VERSION=1.10.0 1.10: HARBOR_USE_SSL=1 2.0: HARBOR_VERSION=2.0.5 From 8e7734c16f8df3dec9fb6354902cb3e7e05395a4 Mon Sep 17 00:00:00 2001 From: Julia Simon <611228+hithwen@users.noreply.github.com> Date: Tue, 26 Jul 2022 15:48:51 +0200 Subject: [PATCH 2/5] Try with different network names --- .../compose/harbor-1.10.0/docker-compose.yml | 44 +++++++++---------- .../compose/harbor-2.0.5/docker-compose.yml | 24 +++++----- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/harbor/tests/compose/harbor-1.10.0/docker-compose.yml b/harbor/tests/compose/harbor-1.10.0/docker-compose.yml index 4066e284c025e..65d28f1711205 100644 --- a/harbor/tests/compose/harbor-1.10.0/docker-compose.yml +++ b/harbor/tests/compose/harbor-1.10.0/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.8' services: registry: - image: goharbor/registry-photon:v2.7.1-patch-2819-2553-v1.10.0 + image: goharbor/registry-photon:v1.10.11 container_name: registry restart: always cap_drop: @@ -14,10 +14,10 @@ services: - ./config/registry/config.yml:/etc/registry/config.yml - ../common/root.crt:/etc/registry/root.crt networks: - - harbor + - harbor-110 dns_search: . registryctl: - image: goharbor/harbor-registryctl:v1.10.0 + image: goharbor/harbor-registryctl:v1.10.11 container_name: registryctl env_file: - ./config/registryctl/env @@ -31,10 +31,10 @@ services: volumes: - ./config/registryctl/config.yml:/etc/registryctl/config.yml networks: - - harbor + - harbor-110 dns_search: . postgresql: - image: goharbor/harbor-db:v1.10.0 + image: goharbor/harbor-db:v1.10.11 container_name: harbor-db restart: always cap_drop: @@ -45,12 +45,12 @@ services: - SETGID - SETUID networks: - - harbor + - harbor-110 dns_search: . env_file: - ./config/db/env core: - image: goharbor/harbor-core:v1.10.0 + image: goharbor/harbor-core:v1.10.11 container_name: harbor-core env_file: - ./config/core/env @@ -72,8 +72,8 @@ services: source: ../common/secretkey target: /etc/core/key networks: - harbor: - harbor-chartmuseum: + harbor-110: + harbor-chartmuseum-110: aliases: - harbor-core dns_search: . @@ -82,7 +82,7 @@ services: - redis - postgresql portal: - image: goharbor/harbor-portal:v1.10.0 + image: goharbor/harbor-portal:v1.10.11 container_name: harbor-portal restart: always cap_drop: @@ -93,11 +93,11 @@ services: - SETUID - NET_BIND_SERVICE networks: - - harbor + - harbor-110 dns_search: . jobservice: - image: goharbor/harbor-jobservice:v1.10.0 + image: goharbor/harbor-jobservice:v1.10.11 container_name: harbor-jobservice env_file: - ./config/jobservice/env @@ -113,12 +113,12 @@ services: source: ./config/jobservice/config.yml target: /etc/jobservice/config.yml networks: - - harbor + - harbor-110 dns_search: . depends_on: - core redis: - image: goharbor/redis-photon:v1.10.0 + image: goharbor/redis-photon:v1.10.11 container_name: redis restart: always cap_drop: @@ -128,13 +128,13 @@ services: - SETGID - SETUID networks: - harbor: - harbor-chartmuseum: + harbor-110: + harbor-chartmuseum-110: aliases: - redis dns_search: . proxy: - image: goharbor/nginx-photon:v1.10.0 + image: goharbor/nginx-photon:v1.10.11 container_name: nginx restart: always cap_drop: @@ -148,7 +148,7 @@ services: - ./config/nginx:/etc/nginx:z - ../common/cert/:/etc/cert:z networks: - - harbor + - harbor-110 dns_search: . ports: - 80:8080 @@ -159,7 +159,7 @@ services: - portal chartmuseum: container_name: chartmuseum - image: goharbor/chartmuseum-photon:v0.9.0-v1.10.0 + image: goharbor/chartmuseum-photon:v0.9.0-v1.10.11 restart: always cap_drop: - ALL @@ -169,14 +169,14 @@ services: - SETGID - SETUID networks: - - harbor-chartmuseum + - harbor-chartmuseum-110 dns_search: . volumes: - ./config/chartserver:/etc/chartserver:z env_file: ./config/chartserver/env networks: - harbor: + harbor-110: external: false - harbor-chartmuseum: + harbor-chartmuseum-110: external: false diff --git a/harbor/tests/compose/harbor-2.0.5/docker-compose.yml b/harbor/tests/compose/harbor-2.0.5/docker-compose.yml index 997aa131086d3..30e9cd99f1eea 100644 --- a/harbor/tests/compose/harbor-2.0.5/docker-compose.yml +++ b/harbor/tests/compose/harbor-2.0.5/docker-compose.yml @@ -13,7 +13,7 @@ services: volumes: - ./config/registry/:/etc/registry/:z networks: - - harbor + - harbor-205 dns_search: . registryctl: image: goharbor/harbor-registryctl:v2.0.5 @@ -47,7 +47,7 @@ services: - SETGID - SETUID networks: - - harbor + - harbor-205 dns_search: . env_file: - ./config/db/env @@ -71,8 +71,8 @@ services: source: ../common/secretkey target: /etc/core/key networks: - harbor: - harbor-chartmuseum: + harbor-205: + harbor-chartmuseum-205: aliases: - harbor-core dns_search: . @@ -92,7 +92,7 @@ services: - SETUID - NET_BIND_SERVICE networks: - - harbor + - harbor-205 dns_search: . jobservice: @@ -112,7 +112,7 @@ services: source: ./config/jobservice/config.yml target: /etc/jobservice/config.yml networks: - - harbor + - harbor-205 dns_search: . depends_on: - core @@ -127,8 +127,8 @@ services: - SETGID - SETUID networks: - harbor: - harbor-chartmuseum: + harbor-205: + harbor-chartmuseum-205: aliases: - redis dns_search: . @@ -147,7 +147,7 @@ services: - ./config/nginx:/etc/nginx:z - ../common/cert/:/etc/cert:z networks: - - harbor + - harbor-205 dns_search: . ports: - 80:8080 @@ -168,12 +168,12 @@ services: - SETGID - SETUID networks: - - harbor-chartmuseum + - harbor-chartmuseum-205 dns_search: . env_file: ./config/chartserver/env networks: - harbor: + harbor-205: external: false - harbor-chartmuseum: + harbor-chartmuseum-205: external: false From 842dab6878ce4c3cfc294106c7a27e3d812959f0 Mon Sep 17 00:00:00 2001 From: Julia Simon <611228+hithwen@users.noreply.github.com> Date: Tue, 26 Jul 2022 15:56:29 +0200 Subject: [PATCH 3/5] Fix docker image version --- harbor/tests/compose/harbor-1.10.0/docker-compose.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/harbor/tests/compose/harbor-1.10.0/docker-compose.yml b/harbor/tests/compose/harbor-1.10.0/docker-compose.yml index 65d28f1711205..20be2ef975b0b 100644 --- a/harbor/tests/compose/harbor-1.10.0/docker-compose.yml +++ b/harbor/tests/compose/harbor-1.10.0/docker-compose.yml @@ -92,7 +92,12 @@ services: - SETGID - SETUID - NET_BIND_SERVICE - networks: + goharbor/chartmuseum-photon:v0: + 9: + 0-v1: + 10: + 11: + ks: - harbor-110 dns_search: . @@ -159,7 +164,7 @@ services: - portal chartmuseum: container_name: chartmuseum - image: goharbor/chartmuseum-photon:v0.9.0-v1.10.11 + image: goharbor/chartmuseum-photon:v1.10.11 restart: always cap_drop: - ALL From 7a7706c7fdf9db3fd8e4d124ad4a8c3cfe53d839 Mon Sep 17 00:00:00 2001 From: Julia Simon <611228+hithwen@users.noreply.github.com> Date: Tue, 26 Jul 2022 16:00:13 +0200 Subject: [PATCH 4/5] Fix bad paste --- harbor/tests/compose/harbor-1.10.0/docker-compose.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/harbor/tests/compose/harbor-1.10.0/docker-compose.yml b/harbor/tests/compose/harbor-1.10.0/docker-compose.yml index 20be2ef975b0b..5361f1dedc8b0 100644 --- a/harbor/tests/compose/harbor-1.10.0/docker-compose.yml +++ b/harbor/tests/compose/harbor-1.10.0/docker-compose.yml @@ -92,12 +92,7 @@ services: - SETGID - SETUID - NET_BIND_SERVICE - goharbor/chartmuseum-photon:v0: - 9: - 0-v1: - 10: - 11: - ks: + networks: - harbor-110 dns_search: . From cf68a799e4d49fd14d3db153b9479935fa1a8b6a Mon Sep 17 00:00:00 2001 From: Julia Simon <611228+hithwen@users.noreply.github.com> Date: Tue, 26 Jul 2022 16:04:23 +0200 Subject: [PATCH 5/5] Ensure all networks defined --- harbor/tests/compose/harbor-2.0.5/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harbor/tests/compose/harbor-2.0.5/docker-compose.yml b/harbor/tests/compose/harbor-2.0.5/docker-compose.yml index 30e9cd99f1eea..00d4d5687c36f 100644 --- a/harbor/tests/compose/harbor-2.0.5/docker-compose.yml +++ b/harbor/tests/compose/harbor-2.0.5/docker-compose.yml @@ -33,7 +33,7 @@ services: source: ./config/registryctl/config.yml target: /etc/registryctl/config.yml networks: - - harbor + - harbor-205 dns_search: . postgresql: image: goharbor/harbor-db:v2.0.5