From f6ce583b22dfc26fa6e46d6a5c0d43a3a0fcecf1 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 15 Jan 2020 23:33:02 +0000 Subject: [PATCH] 2.25.0-debian-9-r2 release --- bitnami/git/2/debian-9/Dockerfile | 14 +++----------- bitnami/git/2/debian-9/prebuildfs/bitnami-user.sh | 6 ++++++ bitnami/git/2/debian-9/prebuildfs/install-nami.sh | 7 +++++++ bitnami/git/README.md | 3 +-- 4 files changed, 17 insertions(+), 13 deletions(-) create mode 100755 bitnami/git/2/debian-9/prebuildfs/bitnami-user.sh create mode 100755 bitnami/git/2/debian-9/prebuildfs/install-nami.sh diff --git a/bitnami/git/2/debian-9/Dockerfile b/bitnami/git/2/debian-9/Dockerfile index be57854cd29c..1130f6a2f00e 100644 --- a/bitnami/git/2/debian-9/Dockerfile +++ b/bitnami/git/2/debian-9/Dockerfile @@ -6,19 +6,11 @@ ENV PATH="/opt/bitnami/git/bin:/opt/bitnami/nami/bin:$PATH" COPY prebuildfs / # Install required system packages and dependencies RUN install_packages ca-certificates curl dirmngr gnupg libc6 libcomerr2 libcurl3 libffi6 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libidn11 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle6 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.0.2 libssl1.1 libtasn1-6 libunistring0 procps ssh sudo unzip zlib1g -RUN curl --silent -L https://nami-prod.s3.amazonaws.com/tools/nami/releases/nami-1.0.0-1-linux-x64.tar.gz > /tmp/nami-linux-x64.tar.gz && \ - echo "80488279b056d5e9c183fe34097c5f496715ab16a602afcc9f78d59f15139a16 /tmp/nami-linux-x64.tar.gz" | sha256sum --check && \ - mkdir -p /opt/bitnami/nami /opt/bitnami/licenses && \ - tar xzf /tmp/nami-linux-x64.tar.gz --strip 1 -C /opt/bitnami/nami && \ - rm /tmp/nami-linux-x64.tar.gz && \ - curl --silent -L https://raw.githubusercontent.com/bitnami/nami/master/COPYING > /opt/bitnami/licenses/nami-1.0.0-1.txt +RUN /bitnami-user.sh && \ + /install-nami.sh RUN bitnami-pkg install git-2.25.0-0 --checksum 49b040c04ed41e5707e3aac4bbc13553a865dc16acd2053e50e4355d13a373d1 RUN apt-get update && apt-get upgrade && \ rm -r /var/lib/apt/lists /var/cache/apt/archives -RUN useradd -ms /bin/bash bitnami && \ - mkdir -p /opt/bitnami && chown bitnami:bitnami /opt/bitnami && \ - sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers && \ - echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers RUN curl --silent -L https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64 > /usr/local/bin/gosu && \ echo 0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7 /usr/local/bin/gosu | sha256sum --check && \ chmod u+x /usr/local/bin/gosu && \ @@ -35,7 +27,7 @@ RUN for server in "ha.pool.sks-keyservers.net" "hkp://p80.pool.sks-keyservers.ne COPY rootfs / ENV BITNAMI_APP_NAME="git" \ - BITNAMI_IMAGE_VERSION="2.25.0-debian-9-r1" + BITNAMI_IMAGE_VERSION="2.25.0-debian-9-r2" ENTRYPOINT [ "git" ] CMD [ "--help" ] diff --git a/bitnami/git/2/debian-9/prebuildfs/bitnami-user.sh b/bitnami/git/2/debian-9/prebuildfs/bitnami-user.sh new file mode 100755 index 000000000000..ab84296bcdfa --- /dev/null +++ b/bitnami/git/2/debian-9/prebuildfs/bitnami-user.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +useradd -ms /bin/bash bitnami +mkdir -p /opt/bitnami && chown bitnami:bitnami /opt/bitnami +sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers +echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers diff --git a/bitnami/git/2/debian-9/prebuildfs/install-nami.sh b/bitnami/git/2/debian-9/prebuildfs/install-nami.sh new file mode 100755 index 000000000000..d8a59c381f6d --- /dev/null +++ b/bitnami/git/2/debian-9/prebuildfs/install-nami.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +curl --silent -L https://nami-prod.s3.amazonaws.com/tools/nami/releases/nami-1.0.0-1-linux-x64.tar.gz > /tmp/nami-linux-x64.tar.gz +echo "80488279b056d5e9c183fe34097c5f496715ab16a602afcc9f78d59f15139a16 /tmp/nami-linux-x64.tar.gz" | sha256sum --check +mkdir -p /opt/bitnami/nami /opt/bitnami/licenses +tar xzf /tmp/nami-linux-x64.tar.gz --strip 1 -C /opt/bitnami/nami && rm /tmp/nami-linux-x64.tar.gz +curl --silent -L https://raw.githubusercontent.com/bitnami/nami/master/COPYING > /opt/bitnami/licenses/nami-1.0.0-1.txt diff --git a/bitnami/git/README.md b/bitnami/git/README.md index 4034ee086b25..dd276770cf1f 100644 --- a/bitnami/git/README.md +++ b/bitnami/git/README.md @@ -29,8 +29,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`2-ol-7`, `2.25.0-ol-7-r1` (2/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.25.0-ol-7-r1/2/ol-7/Dockerfile) -* [`2-debian-9`, `2.25.0-debian-9-r1`, `2`, `2.25.0`, `2.25.0-r1`, `latest` (2/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.25.0-debian-9-r1/2/debian-9/Dockerfile) -* [`2-centos-7`, `2.25.0-centos-7-r0` (2/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.25.0-centos-7-r0/2/centos-7/Dockerfile) +* [`2-debian-9`, `2.25.0-debian-9-r2`, `2`, `2.25.0`, `2.25.0-r2`, `latest` (2/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.25.0-debian-9-r2/2/debian-9/Dockerfile) Subscribe to project updates by watching the [bitnami/git GitHub repo](https://github.com/bitnami/bitnami-docker-git).