diff --git a/bitnami/apisix/3/debian-11/Dockerfile b/bitnami/apisix/3/debian-11/Dockerfile index 90edba65aa57..c319a4d288c8 100644 --- a/bitnami/apisix/3/debian-11/Dockerfile +++ b/bitnami/apisix/3/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="2023-12-27T16:15:52Z" \ + org.opencontainers.image.created="2024-01-20T06:39:15Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.7.0-debian-11-r2" \ + org.opencontainers.image.ref.name="3.7.0-debian-11-r3" \ org.opencontainers.image.title="apisix" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.7.0" @@ -26,8 +26,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libbrotli1 libbsd0 libcrypt1 libdeflate0 libexpat1 libffi7 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libgd3 libgeoip1 libgmp10 libgnutls30 libgpg-error0 libhogweed6 libicu67 libidn2-0 libjbig0 libjpeg62-turbo libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libpng16-16 libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtiff5 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxml2 libxpm4 libxslt1.1 libzstd1 procps zlib1g 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" \ + "yq-4.40.5-1-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-5-linux-${OS_ARCH}-debian-11" \ "apisix-3.7.0-0-linux-${OS_ARCH}-debian-11" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -44,6 +44,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN useradd -r -u 1001 -g root apisix RUN chmod g+rwX /opt/bitnami/apisix/conf && mkdir -p /usr/local/apisix/logs && chmod -R g+rwX /usr/local/apisix && ln -s /opt/bitnami/apisix/conf /usr/local/apisix && ln -s /opt/bitnami/apisix/deps /usr/local/apisix && ln -s /opt/bitnami/apisix/openresty/luajit/share/lua/*/apisix /usr/local/apisix +RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true ENV APP_VERSION="3.7.0" \ BITNAMI_APP_NAME="apisix" \ diff --git a/bitnami/apisix/3/debian-11/docker-compose.yml b/bitnami/apisix/3/debian-11/docker-compose.yml deleted file mode 100644 index 7f3b28fb3517..000000000000 --- a/bitnami/apisix/3/debian-11/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' - -services: - apisix: - image: docker.io/bitnami/apisix:3 diff --git a/bitnami/apisix/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/apisix/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index bf28e1d9a707..189021f00f49 100644 --- a/bitnami/apisix/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/apisix/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,12 +9,12 @@ "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/3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/apisix/3/debian-11/prebuildfs/usr/sbin/run-script index b7a5bf1e50bf..4ca0f897277e 100755 --- a/bitnami/apisix/3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/apisix/3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-y}" +fail_if_not_present="${3:-n}" if test -f "$script"; then sh $script diff --git a/bitnami/apisix/README.md b/bitnami/apisix/README.md index ae9099748732..4207831d95c7 100644 --- a/bitnami/apisix/README.md +++ b/bitnami/apisix/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 bitnami/apisix -``` - -### Docker Compose - -```console -curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/apisix/docker-compose.yml > docker-compose.yml -docker-compose up -d +docker run -it --name apisix bitnami/apisix:latest ``` ## Why use Bitnami Images? @@ -73,20 +66,12 @@ Bitnami provides up-to-date versions of Apache APISIX, including security patche docker pull bitnami/apisix:latest ``` -or if you're using Docker Compose, update the value of the image property to `bitnami/apisix:latest`. - #### Step 2: Remove the currently running container ```console docker rm -v apisix ``` -or using Docker Compose: - -```console -docker-compose rm -v apisix -``` - #### 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 bitnami/apisix:latest ``` -or using Docker Compose: - -```console -docker-compose up apisix -``` - ## Configuration ### Running commands @@ -113,6 +92,12 @@ docker run --rm --name apisix bitnami/apisix:latest --help Check the [official Apache APISIX documentation](https://apisix.apache.org/docs/) for more information about how to use Apache APISIX. +## 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.