From 887ef89a909fdd53c24fe2d244317b6ec5513f44 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Fri, 25 Jun 2021 10:09:03 +0200 Subject: [PATCH] chore: migrate harbor from 2.2.2 to 2.3.0 --- templates/harbor/harbor/docker-compose.yml.j2 | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/templates/harbor/harbor/docker-compose.yml.j2 b/templates/harbor/harbor/docker-compose.yml.j2 index d3dc571..dc96d85 100644 --- a/templates/harbor/harbor/docker-compose.yml.j2 +++ b/templates/harbor/harbor/docker-compose.yml.j2 @@ -1,7 +1,7 @@ version: '2.3' services: log: - image: goharbor/harbor-log:v2.2.2 + image: goharbor/harbor-log:v2.3.0 container_name: harbor-log restart: always dns_search: . @@ -25,7 +25,7 @@ services: networks: - harbor registry: - image: goharbor/registry-photon:v2.2.2 + image: goharbor/registry-photon:v2.3.0 container_name: registry restart: always cap_drop: @@ -51,10 +51,10 @@ services: logging: driver: "syslog" options: - syslog-address: "tcp://127.0.0.1:1514" + syslog-address: "tcp://localhost:1514" tag: "registry" registryctl: - image: goharbor/harbor-registryctl:v2.2.2 + image: goharbor/harbor-registryctl:v2.3.0 container_name: registryctl env_file: - ./common/config/registryctl/env @@ -82,10 +82,10 @@ services: logging: driver: "syslog" options: - syslog-address: "tcp://127.0.0.1:1514" + syslog-address: "tcp://localhost:1514" tag: "registryctl" postgresql: - image: goharbor/harbor-db:v2.2.2 + image: goharbor/harbor-db:v2.3.0 container_name: harbor-db restart: always cap_drop: @@ -107,10 +107,11 @@ services: logging: driver: "syslog" options: - syslog-address: "tcp://127.0.0.1:1514" + syslog-address: "tcp://localhost:1514" tag: "postgresql" + shm_size: '1gb' core: - image: goharbor/harbor-core:v2.2.2 + image: goharbor/harbor-core:v2.3.0 container_name: harbor-core env_file: - ./common/config/core/env @@ -150,13 +151,13 @@ services: logging: driver: "syslog" options: - syslog-address: "tcp://127.0.0.1:1514" + syslog-address: "tcp://localhost:1514" tag: "core" extra_hosts: - dev-keycloak-01.smardigo.digital:10.1.0.2 - dev-mail-01.smardigo.digital:10.2.0.2 portal: - image: goharbor/harbor-portal:v2.2.2 + image: goharbor/harbor-portal:v2.3.0 container_name: harbor-portal restart: always cap_drop: @@ -178,11 +179,11 @@ services: logging: driver: "syslog" options: - syslog-address: "tcp://127.0.0.1:1514" + syslog-address: "tcp://localhost:1514" tag: "portal" jobservice: - image: goharbor/harbor-jobservice:v2.2.2 + image: goharbor/harbor-jobservice:v2.3.0 container_name: harbor-jobservice env_file: - ./common/config/jobservice/env @@ -209,10 +210,10 @@ services: logging: driver: "syslog" options: - syslog-address: "tcp://127.0.0.1:1514" + syslog-address: "tcp://localhost:1514" tag: "jobservice" redis: - image: goharbor/redis-photon:v2.2.2 + image: goharbor/redis-photon:v2.3.0 container_name: redis restart: always cap_drop: @@ -234,10 +235,10 @@ services: logging: driver: "syslog" options: - syslog-address: "tcp://127.0.0.1:1514" + syslog-address: "tcp://localhost:1514" tag: "redis" proxy: - image: goharbor/nginx-photon:v2.2.2 + image: goharbor/nginx-photon:v2.3.0 container_name: nginx restart: always cap_drop: @@ -267,7 +268,7 @@ services: logging: driver: "syslog" options: - syslog-address: "tcp://127.0.0.1:1514" + syslog-address: "tcp://localhost:1514" tag: "proxy" labels: - "traefik.enable=true" @@ -288,7 +289,7 @@ services: trivy-adapter: container_name: trivy-adapter - image: goharbor/trivy-adapter-photon:v2.2.2 + image: goharbor/trivy-adapter-photon:v2.3.0 restart: always cap_drop: - ALL @@ -311,13 +312,13 @@ services: logging: driver: "syslog" options: - syslog-address: "tcp://127.0.0.1:1514" + syslog-address: "tcp://localhost:1514" tag: "trivy-adapter" env_file: ./common/config/trivy-adapter/env chartmuseum: container_name: chartmuseum - image: goharbor/chartmuseum-photon:v2.2.2 + image: goharbor/chartmuseum-photon:v2.3.0 restart: always cap_drop: - ALL @@ -340,12 +341,12 @@ services: logging: driver: "syslog" options: - syslog-address: "tcp://127.0.0.1:1514" + syslog-address: "tcp://localhost:1514" tag: "chartmuseum" env_file: ./common/config/chartserver/env exporter: - image: goharbor/harbor-exporter:v2.2.2 + image: goharbor/harbor-exporter:v2.3.0 container_name: harbor-exporter env_file: - ./common/config/exporter/env @@ -363,7 +364,7 @@ services: logging: driver: "syslog" options: - syslog-address: "tcp://127.0.0.1:1514" + syslog-address: "tcp://localhost:1514" tag: "exporter" networks: harbor: