diff --git a/bitnami/apisix-ingress-controller/1/debian-11/Dockerfile b/bitnami/apisix-ingress-controller/1/debian-11/Dockerfile index 44b2cd2a46bf..ff771c6e4323 100644 --- a/bitnami/apisix-ingress-controller/1/debian-11/Dockerfile +++ b/bitnami/apisix-ingress-controller/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ 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-10T02:33:22Z" \ + org.opencontainers.image.created="2024-01-19T10:30:28Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.7.1-debian-11-r3" \ + org.opencontainers.image.ref.name="1.8.0-debian-11-r0" \ org.opencontainers.image.title="apisix-ingress-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.7.1" + org.opencontainers.image.version="1.8.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -26,9 +26,9 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl procps RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.40.5-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ - "apisix-ingress-controller-1.7.1-2-linux-${OS_ARCH}-debian-11" \ + "yq-4.40.5-1-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-5-linux-${OS_ARCH}-debian-11" \ + "apisix-ingress-controller-1.8.0-0-linux-${OS_ARCH}-debian-11" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -43,8 +43,9 @@ 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 useradd -r -u 1001 -g root apisix-ingress-controller +RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true -ENV APP_VERSION="1.7.1" \ +ENV APP_VERSION="1.8.0" \ BITNAMI_APP_NAME="apisix-ingress-controller" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/apisix-ingress-controller/bin:$PATH" diff --git a/bitnami/apisix-ingress-controller/1/debian-11/docker-compose.yml b/bitnami/apisix-ingress-controller/1/debian-11/docker-compose.yml deleted file mode 100644 index f22ed4cbbc51..000000000000 --- a/bitnami/apisix-ingress-controller/1/debian-11/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' - -services: - apisix-ingress-controller: - image: docker.io/bitnami/apisix-ingress-controller:1 diff --git a/bitnami/apisix-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/apisix-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8d489e5c83c1..6800bffb0dd3 100644 --- a/bitnami/apisix-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/apisix-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,18 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.7.1-2" + "version": "1.8.0-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-4" + "version": "1.0.6-5" }, "yq": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.40.5-0" + "version": "4.40.5-1" } } \ No newline at end of file diff --git a/bitnami/apisix-ingress-controller/1/debian-11/tags-info.yaml b/bitnami/apisix-ingress-controller/1/debian-11/tags-info.yaml index 019dfa293b1a..96825eeb2c81 100644 --- a/bitnami/apisix-ingress-controller/1/debian-11/tags-info.yaml +++ b/bitnami/apisix-ingress-controller/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.7.1 +- 1.8.0 - latest diff --git a/bitnami/apisix-ingress-controller/README.md b/bitnami/apisix-ingress-controller/README.md index 14b1081c1a39..131a435c432c 100644 --- a/bitnami/apisix-ingress-controller/README.md +++ b/bitnami/apisix-ingress-controller/README.md @@ -10,14 +10,7 @@ Trademarks: This software listing is packaged by Bitnami. The respective tradema ## TL;DR ```console -docker run -it --name apisix-ingress-controller bitnami/apisix-ingress-controller -``` - -### Docker Compose - -```console -curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/apisix-ingress-controller/docker-compose.yml > docker-compose.yml -docker-compose up -d +docker run -it --name apisix-ingress-controller bitnami/apisix-ingress-controller:latest ``` ## Why use Bitnami Images? @@ -73,20 +66,12 @@ Bitnami provides up-to-date versions of Apache APISIX Ingress Controller, includ docker pull bitnami/apisix-ingress-controller:latest ``` -or if you're using Docker Compose, update the value of the image property to `bitnami/apisix-ingress-controller:latest`. - #### Step 2: Remove the currently running container ```console docker rm -v apisix-ingress-controller ``` -or using Docker Compose: - -```console -docker-compose rm -v apisix-ingress-controller -``` - #### Step 3: Run the new image Re-create your container from the new image. @@ -95,12 +80,6 @@ Re-create your container from the new image. docker run --name apisix-ingress-controller bitnami/apisix-ingress-controller:latest ``` -or using Docker Compose: - -```console -docker-compose up apisix-ingress-controller -``` - ## Configuration ### Running commands @@ -113,6 +92,12 @@ docker run --rm --name apisix-ingress-controller bitnami/apisix-ingress-controll Check the [official Apache APISIX Ingress Controller documentation](https://github.com/apache/apisix-ingress-controllerdocs/) for more information about how to use Apache APISIX Ingress Controller. +## 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 Docker image. 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.