From fd85ba2fed03b53af6bbb1046950406f86fe2f7d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 19 Jan 2024 22:39:14 +0100 Subject: [PATCH] [bitnami/harbor-exporter] Release 2.10.0-debian-11-r2 (#55004) Signed-off-by: Bitnami Containers --- .../harbor-exporter/2/debian-11/Dockerfile | 5 +- .../2/debian-11/docker-compose.yml | 87 ------------------- bitnami/harbor-exporter/README.md | 41 ++++++++- 3 files changed, 40 insertions(+), 93 deletions(-) delete mode 100644 bitnami/harbor-exporter/2/debian-11/docker-compose.yml diff --git a/bitnami/harbor-exporter/2/debian-11/Dockerfile b/bitnami/harbor-exporter/2/debian-11/Dockerfile index 4c3e6b2819d2..733e4e4180d2 100644 --- a/bitnami/harbor-exporter/2/debian-11/Dockerfile +++ b/bitnami/harbor-exporter/2/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2024-01-10T12:01:57Z" \ + org.opencontainers.image.created="2024-01-19T20:33:45Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.10.0-debian-11-r1" \ + org.opencontainers.image.ref.name="2.10.0-debian-11-r2" \ org.opencontainers.image.title="harbor-exporter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.10.0" @@ -41,6 +41,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami +RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/harbor-exporter/postunpack.sh diff --git a/bitnami/harbor-exporter/2/debian-11/docker-compose.yml b/bitnami/harbor-exporter/2/debian-11/docker-compose.yml deleted file mode 100644 index e2e2d6f78315..000000000000 --- a/bitnami/harbor-exporter/2/debian-11/docker-compose.yml +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' - -services: - registry: - image: docker.io/bitnami/harbor-registry:2 - environment: - - REGISTRY_HTTP_SECRET=CHANGEME - volumes: - - registry_data:/storage - - ./config/registry/:/etc/registry/:ro - postgresql: - image: docker.io/bitnami/postgresql:13 - container_name: harbor-db - environment: - - POSTGRESQL_PASSWORD=bitnami - - POSTGRESQL_DATABASE=registry - volumes: - - postgresql_data:/bitnami/postgresql - redis: - image: docker.io/bitnami/redis:7.0 - environment: - # ALLOW_EMPTY_PASSWORD is recommended only for development. - - ALLOW_EMPTY_PASSWORD=yes - core: - image: docker.io/bitnami/harbor-core:2 - container_name: harbor-core - depends_on: - - registry - environment: - - CORE_KEY=change-this-key - - _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=http://reg.mydomain.com - - DATABASE_TYPE=postgresql - - REGISTRY_CONTROLLER_URL=http://registryctl:8080 - - POSTGRESQL_HOST=postgresql - - POSTGRESQL_PORT=5432 - - POSTGRESQL_DATABASE=registry - - POSTGRESQL_USERNAME=postgres - - POSTGRESQL_PASSWORD=bitnami - - POSTGRESQL_SSLMODE=disable - - REGISTRY_URL=http://registry:5000 - - TOKEN_SERVICE_URL=http://core:8080/service/token - - HARBOR_ADMIN_PASSWORD=bitnami - - CORE_SECRET=CHANGEME - - JOBSERVICE_SECRET=CHANGEME - - ADMIRAL_URL= - - CORE_URL=http://core:8080 - - JOBSERVICE_URL=http://jobservice:8080 - - REGISTRY_STORAGE_PROVIDER_NAME=filesystem - - REGISTRY_CREDENTIAL_USERNAME=harbor_registry_user - - REGISTRY_CREDENTIAL_PASSWORD=harbor_registry_password - - READ_ONLY=false - - RELOAD_KEY= - volumes: - - core_data:/data - - ./config/core/app.conf:/etc/core/app.conf:ro - - ./config/core/private_key.pem:/etc/core/private_key.pem:ro - harbor-exporter: - image: docker.io/bitnami/harbor-exporter:2 - depends_on: - - postgresql - - core - - redis - environment: - - HARBOR_DATABASE_HOST=postgresql - - HARBOR_DATABASE_USERNAME=postgres - - HARBOR_DATABASE_PASSWORD=bitnami - - HARBOR_DATABASE_DBNAME=registry - - HARBOR_REDIS_URL=redis://redis:6379/1 - - HARBOR_SERVICE_SCHEME=http - - HARBOR_SERVICE_HOST=core - - HARBOR_SERVICE_PORT=8080 -volumes: - registry_data: - driver: local - core_data: - driver: local - postgresql_data: - driver: local diff --git a/bitnami/harbor-exporter/README.md b/bitnami/harbor-exporter/README.md index 8ceaf4db7b07..dcd957ceedbe 100644 --- a/bitnami/harbor-exporter/README.md +++ b/bitnami/harbor-exporter/README.md @@ -8,12 +8,10 @@ ## TL;DR -This container is part of the [Harbor solution](https://github.com/bitnami/charts/tree/main/bitnami/harbor) that is primarily intended to be deployed in Kubernetes. You can deploy Harbor solution and then enable this specific container with the command below: +This container is part of the [Harbor solution](https://github.com/bitnami/charts/tree/main/bitnami/harbor) that is primarily intended to be deployed in Kubernetes. ```console -curl -LO https://raw.githubusercontent.com/bitnami/containers/main/bitnami/harbor-portal/docker-compose.yml -curl -L https://github.com/bitnami/containers/archive/main.tar.gz | tar xz --strip=2 containers-main/bitnami/harbor-portal && cp -RL harbor-portal/config . && rm -rf harbor-portal -docker-compose up +docker run --name harbor-exporter bitnami/harbor-exporter:latest ``` ## Why use Bitnami Images? @@ -51,6 +49,41 @@ harbor-exporter is a component of the Harbor application. In order to get the Ha For further information about the specific component itself, please refer to the [source repository documentation](https://github.com/goharbor/harbor/tree/main/docs +### Environment variables + +#### Customizable environment variables + +| Name | Description | Default Value | +|--------------------------------|--------------------------------------------------------------------------------------------|---------------------------------------| +| `HARBOR_EXPORTER_BASE_DIR` | harbor-exporter installation directory. | `${BITNAMI_ROOT_DIR}/harbor-exporter` | +| `HARBOR_EXPORTER_LOGS_DIR` | harbor-exporter installation directory. | `${HARBOR_EXPORTER_BASE_DIR}/logs` | +| `HARBOR_EXPORTER_TMP_DIR` | harbor-exporter installation directory. | `${HARBOR_EXPORTER_BASE_DIR}/tmp` | +| `HARBOR_DATABASE_PORT` | The port of external database | `5432` | +| `HARBOR_DATABASE_SSLMODE` | Database certificate verfication: require, verify-full, verify-ca, disable (default value) | `disable` | +| `HARBOR_SERVICE_SCHEME` | Core service scheme (http or https) | `http` | +| `HARBOR_SERVICE_HOST` | Core service hostname | `core` | +| `HARBOR_SERVICE_PORT` | Core service port | `8080` | +| `HARBOR_REDIS_NAMESPACE` | Redis namespace for jobservice. Default `harbor_job_service_namespace | `harbor_job_service_namespace` | +| `HARBOR_REDIS_TIMEOUT` | Redis connection timeout. | `3600` | +| `HARBOR_EXPORTER_PORT` | Port for exporter metrics | `9090` | +| `HARBOR_EXPORTER_METRICS_PATH` | URL path for exporter metrics. | `/metrics` | + +#### Read-only environment variables + +| Name | Description | Value | +|----------------------------------|----------------------------------------------------------------------------|---------------------------------------------------| +| `HARBOR_EXPORTER_DAEMON_USER` | harbor-exporter system user. | `harbor` | +| `HARBOR_EXPORTER_DAEMON_GROUP` | harbor-exporter system group. | `harbor` | +| `HARBOR_EXPORTER_PID_FILE` | PID file for harbor-exporter service. | `${HARBOR_EXPORTER_TMP_DIR}/harbor-exporter.pid` | +| `HARBOR_EXPORTER_LOG_FILE` | Log file for harbor-exporter service. | `${HARBOR_EXPORTER_LOGS_DIR}/harbor-exporter.log` | +| `HARBOR_EXPORTER_EXTRA_ENV_FILE` | File to store extra environment variables for the harbor-exporter service. | `${HARBOR_EXPORTER_BASE_DIR}/.env` | + +## Notable Changes + +### Starting January 16, 2024 + +* The `docker-compose.yaml` file has been removed, as it was solely intended for internal testing purposes. + ## Contributing We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution.