diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile b/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile index 0525af1695c5..6532fd478ddd 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile +++ b/bitnami/harbor-adapter-trivy/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-10T11:51:50Z" \ + org.opencontainers.image.created="2024-01-19T20:29:05Z" \ 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-adapter-trivy" \ 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-adapter-trivy/postunpack.sh diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/docker-compose.yml b/bitnami/harbor-adapter-trivy/2/debian-11/docker-compose.yml deleted file mode 100644 index 966bfb956f18..000000000000 --- a/bitnami/harbor-adapter-trivy/2/debian-11/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' -services: - harbor-adapter-trivy: - image: docker.io/bitnami/harbor-adapter-trivy:2 - ports: - - 8080:8080 - volumes: - - harbor-adapter-trivy_data:/bitnami -volumes: - harbor-adapter-trivy_data: - driver: local diff --git a/bitnami/harbor-adapter-trivy/README.md b/bitnami/harbor-adapter-trivy/README.md index 8d847be01b1c..b5b4e73107d7 100644 --- a/bitnami/harbor-adapter-trivy/README.md +++ b/bitnami/harbor-adapter-trivy/README.md @@ -9,12 +9,10 @@ Trademarks: This software listing is packaged by Bitnami. The respective tradema ## 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-adapter-trivy bitnami/harbor-adapter-trivy:latest ``` ## Why use Bitnami Images? @@ -74,16 +72,6 @@ docker run \ bitnami/harbor-adapter-trivy:latest ``` -You can also do this with a minor change to the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/harbor-adapter-trivy/docker-compose.yml) file present in this repository: - -```yaml -harbor-adapter-trivy: - ... - volumes: - - /path/to/harbor-adapter-trivy-persistence:/bitnami - ... -``` - ## Connecting to other containers Using [Docker container networking](https://docs.docker.com/engine/userguide/networking/), a different server running inside a container can easily be accessed by your application containers and vice-versa. @@ -116,6 +104,29 @@ Harbor Adapter Trivy is a component of the Harbor application. In order to get t For further information about the specific component itself, please refer to the [source repository documentation](https://github.com/aquasecurity/harbor-scanner-trivy#configuration). +### Environment variables + +#### Customizable environment variables + +| Name | Description | Default Value | +|-----------------------------|----------------------------------------------|----------------------------------------------| +| `SCANNER_TRIVY_VOLUME_DIR` | harbor-adapter-trivy installation directory. | `${BITNAMI_VOLUME_DIR}/harbor-adapter-trivy` | +| `SCANNER_TRIVY_CACHE_DIR` | harbor-adapter-trivy installation directory. | `${SCANNER_TRIVY_VOLUME_DIR}/.cache/trivy` | +| `SCANNER_TRIVY_REPORTS_DIR` | harbor-adapter-trivy installation directory. | `${SCANNER_TRIVY_VOLUME_DIR}/.cache/reports` | + +#### Read-only environment variables + +| Name | Description | Value | +|--------------------------------|---------------------------------------------------------------------------------|------------------------------------------------------| +| `SCANNER_TRIVY_BASE_DIR` | harbor-adapter-trivy installation directory. | `${BITNAMI_ROOT_DIR}/harbor-adapter-trivy` | +| `SCANNER_TRIVY_LOGS_DIR` | harbor-adapter-trivy logs directory. | `${SCANNER_TRIVY_BASE_DIR}/logs` | +| `SCANNER_TRIVY_TMP_DIR` | harbor-adapter-trivy directory for temporary files. | `${SCANNER_TRIVY_BASE_DIR}/tmp` | +| `SCANNER_TRIVY_DAEMON_USER` | harbor-adapter-trivy system user. | `trivy-scanner` | +| `SCANNER_TRIVY_DAEMON_GROUP` | harbor-adapter-trivy system group. | `trivy-scanner` | +| `SCANNER_TRIVY_PID_FILE` | PID file for harbor-adapter-trivy service. | `${SCANNER_TRIVY_TMP_DIR}/harbor-adapter-trivy.pid` | +| `SCANNER_TRIVY_LOG_FILE` | Log file for harbor-adapter-trivy service. | `${SCANNER_TRIVY_LOGS_DIR}/harbor-adapter-trivy.log` | +| `SCANNER_TRIVY_EXTRA_ENV_FILE` | File to store extra environment variables for the harbor-adapter-trivy service. | `${SCANNER_TRIVY_BASE_DIR}/.env` | + ## Logging The Bitnami Harbor-Adapter-Trivy Docker image sends the container logs to `stdout`. To view the logs: @@ -160,6 +171,12 @@ Re-create your container from the new image. docker run --name harbor-adapter-trivy bitnami/harbor-adapter-trivy:latest ``` +## 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.