From 6005101c95415bbd381d1aeb408ecae9fd7230ab Mon Sep 17 00:00:00 2001 From: stonezdj Date: Mon, 24 Feb 2020 12:37:24 +0800 Subject: [PATCH] Remove registry notification and change /api/ping Update config.yaml.jinja to remove notification Change api/ping in core/Dockerfile Signed-off-by: stonezdj --- make/photon/core/Dockerfile | 2 +- .../templates/registry/config.yml.jinja | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/make/photon/core/Dockerfile b/make/photon/core/Dockerfile index f0778c574..e515aa47e 100644 --- a/make/photon/core/Dockerfile +++ b/make/photon/core/Dockerfile @@ -1,7 +1,7 @@ ARG harbor_base_image_version FROM goharbor/harbor-core-base:${harbor_base_image_version} -HEALTHCHECK CMD curl --fail -s http://127.0.0.1:8080/api/ping || exit 1 +HEALTHCHECK CMD curl --fail -s http://127.0.0.1:8080/api/v2.0/ping || exit 1 COPY ./make/photon/core/harbor_core /harbor/ COPY ./src/core/views /harbor/views COPY ./make/migrations /harbor/migrations diff --git a/make/photon/prepare/templates/registry/config.yml.jinja b/make/photon/prepare/templates/registry/config.yml.jinja index d3e6b9a4c..d566da0b4 100644 --- a/make/photon/prepare/templates/registry/config.yml.jinja +++ b/make/photon/prepare/templates/registry/config.yml.jinja @@ -31,24 +31,6 @@ auth: path: /etc/registry/passwd validation: disabled: true -notifications: - endpoints: - - name: harbor - disabled: false - url: {{core_url}}/service/notifications - timeout: 3000ms - threshold: 5 - backoff: 1s - ignoredmediatypes: - - application/vnd.docker.image.rootfs.diff.tar.gzip - - application/vnd.docker.image.rootfs.foreign.diff.tar.gzip - - application/vnd.oci.image.layer.v1.tar - - application/vnd.oci.image.layer.v1.tar+gzip - - application/vnd.oci.image.layer.v1.tar+zstd - - application/vnd.oci.image.layer.nondistributable.v1.tar - - application/vnd.oci.image.layer.nondistributable.v1.tar+gzip - - application/vnd.oci.image.layer.nondistributable.v1.tar+zstd - - application/octet-stream compatibility: schema1: enabled: true \ No newline at end of file