diff --git a/bitnami/harbor-exporter/2/debian-11/Dockerfile b/bitnami/harbor-exporter/2/debian-11/Dockerfile index 441dff51e2e2..5ce3854a0144 100644 --- a/bitnami/harbor-exporter/2/debian-11/Dockerfile +++ b/bitnami/harbor-exporter/2/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-05-22T17:39:25Z" \ + org.opencontainers.image.created="2023-05-23T11:43:23Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.8.1-debian-11-r5" \ + org.opencontainers.image.ref.name="2.8.1-debian-11-r6" \ org.opencontainers.image.title="harbor-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.8.1" @@ -22,7 +22,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "harbor-exporter-2.8.1-3-linux-${OS_ARCH}-debian-11" \ + "harbor-exporter-2.8.1-4-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/harbor-exporter/2/debian-11/docker-compose.yml b/bitnami/harbor-exporter/2/debian-11/docker-compose.yml index 996dbcfab85a..ec69756fd135 100644 --- a/bitnami/harbor-exporter/2/debian-11/docker-compose.yml +++ b/bitnami/harbor-exporter/2/debian-11/docker-compose.yml @@ -8,21 +8,6 @@ services: volumes: - registry_data:/storage - ./config/registry/:/etc/registry/:ro - chartmuseum: - container_name: chartmuseum - image: docker.io/bitnami/chartmuseum:0 - environment: - - CACHE=redis - - CACHE_REDIS_ADDR=redis:6379 - - CACHE_REDIS_DB=1 - - DEPTH=1 - - PORT=8080 - - STORAGE=local - - STORAGE_LOCAL_ROOTDIR=/bitnami/data - - ALLOW_OVERWRITE=true - - INDEX_LIMIT=0 - volumes: - - chartmuseum_data:/bitnami/data postgresql: image: docker.io/bitnami/postgresql:11 container_name: harbor-db @@ -41,7 +26,6 @@ services: container_name: harbor-core depends_on: - registry - - chartmuseum environment: - CORE_KEY=change-this-key - _REDIS_URL=redis:6379,100, @@ -66,8 +50,6 @@ services: - JOBSERVICE_SECRET=CHANGEME - ADMIRAL_URL= - WITH_NOTARY=False - - WITH_CHARTMUSEUM=True - - CHART_REPOSITORY_URL=http://chartmuseum:8080 - CORE_URL=http://core:8080 - JOBSERVICE_URL=http://jobservice:8080 - REGISTRY_STORAGE_PROVIDER_NAME=filesystem @@ -101,5 +83,3 @@ volumes: driver: local postgresql_data: driver: local - chartmuseum_data: - driver: local diff --git a/bitnami/harbor-exporter/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-exporter/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ca6723c3115e..3978ad481e08 100644 --- a/bitnami/harbor-exporter/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/harbor-exporter/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.8.1-3" + "version": "2.8.1-4" } } \ No newline at end of file diff --git a/bitnami/harbor-exporter/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh b/bitnami/harbor-exporter/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh index df25073b0c82..6481eb23e8b0 100644 --- a/bitnami/harbor-exporter/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh +++ b/bitnami/harbor-exporter/2/debian-11/rootfs/opt/bitnami/scripts/libharbor.sh @@ -608,58 +608,3 @@ harbor_adapter_trivy_stop() { stop_service_using_pid "$SCANNER_TRIVY_PID_FILE" } -######################## -# Print chartmuseum runtime environment -# Arguments: -# None -# Returns: -# Boolean -######################### -chartmuseum_print_env() { - for var in "${!CHARTMUSEUM_CFG_@}"; do - echo "${var/CHARTMUSEUM_CFG_/}=${!var}" - done -} - -######################## -# Check if chartmuseum is running -# Arguments: -# None -# Returns: -# Boolean -######################### -is_chartmuseum_running() { - # chartmuseum does not create any PID file - # We regenerate the PID file for each time we query it to avoid getting outdated - pgrep -f "$(command -v chartmuseum)" > "$CHARTMUSEUM_PID_FILE" - - pid="$(get_pid_from_file "$CHARTMUSEUM_PID_FILE")" - if [[ -n "$pid" ]]; then - is_service_running "$pid" - else - false - fi -} - -######################## -# Check if chartmuseum is not running -# Arguments: -# None -# Returns: -# Boolean -######################### -is_chartmuseum_not_running() { - ! is_chartmuseum_running -} - -######################## -# Stop chartmuseum -# Arguments: -# None -# Returns: -# None -######################### -chartmuseum_stop() { - ! is_chartmuseum_running && return - stop_service_using_pid "$CHARTMUSEUM_PID_FILE" -} diff --git a/bitnami/harbor-exporter/docker-compose.yml b/bitnami/harbor-exporter/docker-compose.yml index 996dbcfab85a..ec69756fd135 100644 --- a/bitnami/harbor-exporter/docker-compose.yml +++ b/bitnami/harbor-exporter/docker-compose.yml @@ -8,21 +8,6 @@ services: volumes: - registry_data:/storage - ./config/registry/:/etc/registry/:ro - chartmuseum: - container_name: chartmuseum - image: docker.io/bitnami/chartmuseum:0 - environment: - - CACHE=redis - - CACHE_REDIS_ADDR=redis:6379 - - CACHE_REDIS_DB=1 - - DEPTH=1 - - PORT=8080 - - STORAGE=local - - STORAGE_LOCAL_ROOTDIR=/bitnami/data - - ALLOW_OVERWRITE=true - - INDEX_LIMIT=0 - volumes: - - chartmuseum_data:/bitnami/data postgresql: image: docker.io/bitnami/postgresql:11 container_name: harbor-db @@ -41,7 +26,6 @@ services: container_name: harbor-core depends_on: - registry - - chartmuseum environment: - CORE_KEY=change-this-key - _REDIS_URL=redis:6379,100, @@ -66,8 +50,6 @@ services: - JOBSERVICE_SECRET=CHANGEME - ADMIRAL_URL= - WITH_NOTARY=False - - WITH_CHARTMUSEUM=True - - CHART_REPOSITORY_URL=http://chartmuseum:8080 - CORE_URL=http://core:8080 - JOBSERVICE_URL=http://jobservice:8080 - REGISTRY_STORAGE_PROVIDER_NAME=filesystem @@ -101,5 +83,3 @@ volumes: driver: local postgresql_data: driver: local - chartmuseum_data: - driver: local