diff --git a/bitnami/git/2/debian-11/Dockerfile b/bitnami/git/2/debian-11/Dockerfile index 53c55002c356..32a475aa337d 100644 --- a/bitnami/git/2/debian-11/Dockerfile +++ b/bitnami/git/2/debian-11/Dockerfile @@ -5,23 +5,35 @@ ENV OS_ARCH="amd64" \ LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="2.37.2-debian-11-r5" \ + org.opencontainers.image.ref.name="2.37.3-debian-11-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/git" \ org.opencontainers.image.title="git" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.37.2" + org.opencontainers.image.version="2.37.3" COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libbrotli1 libc6 libcom-err2 libcurl4 libffi7 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 procps ssh tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-154" --checksum e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.37.2-1" --checksum 99292b80296148ec1d50efd4247b678776db4cef7c5b8471677bfc0413bacba4 +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f gosu-1.14.0-154-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab gosu-1.14.0-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f git-2.37.3-0-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/git-2.37.3-0-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "3b4d06d50463474afdcecfd62db33965949a6b38fec296f161913d78d92567d4 git-2.37.3-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf git-2.37.3-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf git-2.37.3-0-linux-amd64-debian-11.tar.gz RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives COPY rootfs / -ENV APP_VERSION="2.37.2" \ +ENV APP_VERSION="2.37.3" \ BITNAMI_APP_NAME="git" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/git/bin:$PATH" diff --git a/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8a97e49b6281..f48dd1f271a0 100644 --- a/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,10 +1,10 @@ { "git": { "arch": "amd64", - "digest": "99292b80296148ec1d50efd4247b678776db4cef7c5b8471677bfc0413bacba4", + "digest": "3b4d06d50463474afdcecfd62db33965949a6b38fec296f161913d78d92567d4", "distro": "debian-11", "type": "NAMI", - "version": "2.37.2-1" + "version": "2.37.3-0" }, "gosu": { "arch": "amd64", diff --git a/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh deleted file mode 100644 index a7b60696daa6..000000000000 --- a/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# -# Library for managing Bitnami components - -# Constants -CACHE_ROOT="/tmp/bitnami/pkg/cache" -DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith" - -# Functions - -######################## -# Download and unpack a Bitnami package -# Globals: -# OS_NAME -# OS_ARCH -# OS_FLAVOUR -# Arguments: -# $1 - component's name -# $2 - component's version -# Returns: -# None -######################### -component_unpack() { - local name="${1:?name is required}" - local version="${2:?version is required}" - local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}" - local package_sha256="" - local directory="/opt/bitnami" - - # Validate arguments - shift 2 - while [ "$#" -gt 0 ]; do - case "$1" in - -c|--checksum) - shift - package_sha256="${1:?missing package checksum}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - - echo "Downloading $base_name package" - if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then - echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download." - cp "${CACHE_ROOT}/${base_name}.tar.gz" . - rm "${CACHE_ROOT}/${base_name}.tar.gz" - if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then - echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256" - package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")" - rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256" - fi - else - curl --remote-name --silent --show-error --fail "${DOWNLOAD_URL}/${base_name}.tar.gz" - fi - if [ -n "$package_sha256" ]; then - echo "Verifying package integrity" - echo "$package_sha256 ${base_name}.tar.gz" | sha256sum --check - || return "$?" - fi - tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 || return "$?" - rm "${base_name}.tar.gz" -} diff --git a/bitnami/git/2/debian-11/tags-info.yaml b/bitnami/git/2/debian-11/tags-info.yaml index 17d3a0bc3eac..9ab98400d9ec 100644 --- a/bitnami/git/2/debian-11/tags-info.yaml +++ b/bitnami/git/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - "2-debian-11" - - "2.37.2" + - "2.37.3" - "latest" diff --git a/bitnami/git/README.md b/bitnami/git/README.md index 6030f7b30290..4787d4892f45 100644 --- a/bitnami/git/README.md +++ b/bitnami/git/README.md @@ -28,7 +28,7 @@ $ docker run --name git bitnami/git:latest Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`2`, `2-debian-11`, `2.37.2`, `2.37.2-debian-11-r5`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/git/2/debian-11/Dockerfile) +* [`2`, `2-debian-11`, `2.37.3`, `2.37.3-debian-11-r0`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/git/2/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/git GitHub repo](https://github.com/bitnami/containers/blob/main/bitnami/git).