diff --git a/bitnami/git/2/ol-7/Dockerfile b/bitnami/git/2/ol-7/Dockerfile index 9e69c053fd7b..97fd9c8942fe 100644 --- a/bitnami/git/2/ol-7/Dockerfile +++ b/bitnami/git/2/ol-7/Dockerfile @@ -6,28 +6,17 @@ 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 cyrus-sasl-lib glibc gzip hostname keyutils-libs krb5-libs libaio-devel libcom_err libcurl libidn libselinux libssh2 nspr nss nss-softokn-freebl nss-util openldap openssh-clients openssl-libs pcre procps-ng sudo tar which zlib -RUN /bitnami-user.sh && \ - /install-nami.sh +RUN /build/bitnami-user.sh && \ + /build/install-nami.sh RUN bitnami-pkg install git-2.25.0-0 --checksum 2fd25c5b37cec238a759c3c3643c156d4fe5b00716e2152c7c494cf6729673c9 RUN yum upgrade -y && \ rm -r /var/cache/yum -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 && \ - mkdir -p /opt/bitnami/licenses && \ - curl --silent -L https://raw.githubusercontent.com/tianon/gosu/master/LICENSE > /opt/bitnami/licenses/gosu-1.11.txt -RUN for server in "ha.pool.sks-keyservers.net" "hkp://p80.pool.sks-keyservers.net:80" "keyserver.ubuntu.com" "hkp://keyserver.ubuntu.com:80" "pgp.mit.edu"; do gpg --keyserver $server --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; done && \ - gpg --fingerprint 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 | grep -q "6380 DC42 8747 F6C3 93FE ACA5 9A84 159D 7001 A4E5" && \ - curl --silent -L https://github.com/krallin/tini/releases/download/v0.13.2/tini.asc > /tmp/tini.asc && \ - curl --silent -L https://github.com/krallin/tini/releases/download/v0.13.2/tini > /usr/local/bin/tini && \ - gpg --verify /tmp/tini.asc /usr/local/bin/tini && \ - chmod +x /usr/local/bin/tini && \ - mkdir -p /opt/bitnami/licenses && \ - curl --silent -L https://raw.githubusercontent.com/krallin/tini/master/LICENSE > /opt/bitnami/licenses/tini-0.13.2.txt +RUN /build/install-gosu.sh +RUN /build/install-tini.sh COPY rootfs / ENV BITNAMI_APP_NAME="git" \ - BITNAMI_IMAGE_VERSION="2.25.0-ol-7-r2" + BITNAMI_IMAGE_VERSION="2.25.0-ol-7-r3" ENTRYPOINT [ "git" ] CMD [ "--help" ] diff --git a/bitnami/git/2/ol-7/prebuildfs/build/bitnami-user.sh b/bitnami/git/2/ol-7/prebuildfs/build/bitnami-user.sh new file mode 100755 index 000000000000..ab84296bcdfa --- /dev/null +++ b/bitnami/git/2/ol-7/prebuildfs/build/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/ol-7/prebuildfs/build/install-gosu.sh b/bitnami/git/2/ol-7/prebuildfs/build/install-gosu.sh new file mode 100755 index 000000000000..1756700daa89 --- /dev/null +++ b/bitnami/git/2/ol-7/prebuildfs/build/install-gosu.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +VERSION="1.11" +SHA256="0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7" + +curl --silent -L "https://github.com/tianon/gosu/releases/download/${VERSION}/gosu-amd64" > "/usr/local/bin/gosu" +echo "$SHA256" "/usr/local/bin/gosu" | sha256sum --check +chmod u+x "/usr/local/bin/gosu" +mkdir -p "/opt/bitnami/licenses" +curl --silent -L "https://raw.githubusercontent.com/tianon/gosu/master/LICENSE" > "/opt/bitnami/licenses/gosu-${VERSION}.txt" diff --git a/bitnami/git/2/ol-7/prebuildfs/build/install-nami.sh b/bitnami/git/2/ol-7/prebuildfs/build/install-nami.sh new file mode 100755 index 000000000000..d8a59c381f6d --- /dev/null +++ b/bitnami/git/2/ol-7/prebuildfs/build/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/2/ol-7/prebuildfs/build/install-tini.sh b/bitnami/git/2/ol-7/prebuildfs/build/install-tini.sh new file mode 100755 index 000000000000..8376a36aee5f --- /dev/null +++ b/bitnami/git/2/ol-7/prebuildfs/build/install-tini.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +GPG_KEY="595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7" +GPG_KEY_FINGERPRINT="6380 DC42 8747 F6C3 93FE ACA5 9A84 159D 7001 A4E5" +SERVERS=("ha.pool.sks-keyservers.net" "hkp://p80.pool.sks-keyservers.net:80" "keyserver.ubuntu.com" "hkp://keyserver.ubuntu.com:80" "pgp.mit.edu") +VERSION="0.13.2" + +for server in "${SERVERS[@]}"; do + gpg --keyserver "$server" --recv-keys "$GPG_KEY" && break || : +done +gpg --fingerprint "$GPG_KEY" | grep -q "$GPG_KEY_FINGERPRINT" +curl --silent -L "https://github.com/krallin/tini/releases/download/v${VERSION}/tini.asc" > "/tmp/tini.asc" +curl --silent -L "https://github.com/krallin/tini/releases/download/v${VERSION}/tini" > "/usr/local/bin/tini" +gpg --verify "/tmp/tini.asc" "/usr/local/bin/tini" +chmod +x "/usr/local/bin/tini" +mkdir -p "/opt/bitnami/licenses" +curl --silent -L "https://raw.githubusercontent.com/krallin/tini/master/LICENSE" > "/opt/bitnami/licenses/tini-${VERSION}.txt" diff --git a/bitnami/git/2/ol-7/prebuildfs/usr/local/bin/bitnami-pkg b/bitnami/git/2/ol-7/prebuildfs/usr/local/bin/bitnami-pkg index 0d68b3eda1cc..3d934df5585a 100755 --- a/bitnami/git/2/ol-7/prebuildfs/usr/local/bin/bitnami-pkg +++ b/bitnami/git/2/ol-7/prebuildfs/usr/local/bin/bitnami-pkg @@ -57,6 +57,9 @@ identify_arch() { ol-*) arch=x86_64 ;; + centos-*) + arch=x86_64 + ;; rhel-*) arch=x86_64 ;; diff --git a/bitnami/git/README.md b/bitnami/git/README.md index 3b7368d6b156..60a4754c073e 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/containers/how-to/understand-rolling-tags-containers/). -* [`2-ol-7`, `2.25.0-ol-7-r2` (2/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.25.0-ol-7-r2/2/ol-7/Dockerfile) +* [`2-ol-7`, `2.25.0-ol-7-r3` (2/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.25.0-ol-7-r3/2/ol-7/Dockerfile) * [`2-debian-9`, `2.25.0-debian-9-r3`, `2`, `2.25.0`, `2.25.0-r3`, `latest` (2/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.25.0-debian-9-r3/2/debian-9/Dockerfile) Subscribe to project updates by watching the [bitnami/git GitHub repo](https://github.com/bitnami/bitnami-docker-git).