diff --git a/bitnami/gitlab-runner/15/debian-11/Dockerfile b/bitnami/gitlab-runner/15/debian-11/Dockerfile index e216d61129ed..ed48bf98cf4c 100644 --- a/bitnami/gitlab-runner/15/debian-11/Dockerfile +++ b/bitnami/gitlab-runner/15/debian-11/Dockerfile @@ -4,11 +4,11 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="15.3.0-debian-11-r9" \ + org.opencontainers.image.ref.name="15.4.0-debian-11-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/gitlab-runner" \ org.opencontainers.image.title="gitlab-runner" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="15.3.0" + org.opencontainers.image.version="15.4.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -18,7 +18,7 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages acl ca-certificates curl git git-lfs gzip libc6 openssh-client procps tar +RUN install_packages acl ca-certificates curl git git-lfs gzip openssh-client procps tar RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ if [ ! -f dumb-init-1.2.5-153-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ curl -SsLf https://downloads.bitnami.com/files/stacksmith/dumb-init-1.2.5-153-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ @@ -44,20 +44,20 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f gitlab-runner-15.3.0-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/gitlab-runner-15.3.0-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/gitlab-runner-15.3.0-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ + if [ ! -f gitlab-runner-15.4.0-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/gitlab-runner-15.4.0-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/gitlab-runner-15.4.0-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - sha256sum -c gitlab-runner-15.3.0-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf gitlab-runner-15.3.0-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf gitlab-runner-15.3.0-1-linux-${OS_ARCH}-debian-11.tar.gz gitlab-runner-15.3.0-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 + sha256sum -c gitlab-runner-15.4.0-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf gitlab-runner-15.4.0-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf gitlab-runner-15.4.0-0-linux-${OS_ARCH}-debian-11.tar.gz gitlab-runner-15.4.0-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN mkdir /home/gitlab-runner && chmod -R g+rwX /home/gitlab-runner && ln -s /opt/bitnami/common/bin/dumb-init /usr/bin/dumb-init && ln -s /opt/bitnami/scripts/gitlab-runner/entrypoint.sh /entrypoint -ENV APP_VERSION="15.3.0" \ +ENV APP_VERSION="15.4.0" \ BITNAMI_APP_NAME="gitlab-runner" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/gitlab-runner/bin:$PATH" diff --git a/bitnami/gitlab-runner/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/gitlab-runner/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c0f3e92f4d30..935d08e17022 100644 --- a/bitnami/gitlab-runner/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/gitlab-runner/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,10 +15,10 @@ }, "gitlab-runner": { "arch": "amd64", - "digest": "ba763f836ef0296c4ff17179f8065c6665d6033884f2df2b744d2b2ee04f6fd6", + "digest": "7859c4a04cada56dca51fa1d30a3528f2a8ba0f5eff158aaeb42e909efdf6cf8", "distro": "debian-11", "type": "NAMI", - "version": "15.3.0-1" + "version": "15.4.0-0" }, "gosu": { "arch": "amd64", diff --git a/bitnami/gitlab-runner/15/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/gitlab-runner/15/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 08b1d4884c28..92530b32d94d 100644 --- a/bitnami/gitlab-runner/15/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/gitlab-runner/15/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -197,6 +197,8 @@ am_i_root() { # --version - Distro version # --branch - Distro branch # --codename - Distro codename +# --name - Distro name +# --pretty-name - Distro pretty name # Returns: # String ######################### @@ -223,6 +225,12 @@ get_os_metadata() { --codename) get_os_release_metadata VERSION_CODENAME ;; + --name) + get_os_release_metadata NAME + ;; + --pretty-name) + get_os_release_metadata PRETTY_NAME + ;; *) error "Unknown flag ${flag_name}" return 1 @@ -498,3 +506,50 @@ get_machine_id() { fi echo "$machine_id" } + +######################## +# Get the root partition's disk device ID (e.g. /dev/sda1) +# Globals: +# None +# Arguments: +# None +# Returns: +# Root partition disk ID +######################### +get_disk_device_id() { + local device_id="" + if grep -q ^/dev /proc/mounts; then + device_id="$(grep -q ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)" + fi + # If it could not be autodetected, fallback to /dev/sda1 as a default + if [[ -z "$device_id" || ! -b "$device_id" ]]; then + device_id="/dev/sda1" + fi + echo "$device_id" +} + +######################## +# Get the root disk device ID (e.g. /dev/sda) +# Globals: +# None +# Arguments: +# None +# Returns: +# Root disk ID +######################### +get_root_disk_device_id() { + get_disk_device_id | sed 's/[0-9]\+$//' +} + +######################## +# Get the root disk size in bytes +# Globals: +# None +# Arguments: +# None +# Returns: +# Root disk size in bytes +######################### +get_root_disk_size() { + fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true +} diff --git a/bitnami/gitlab-runner/15/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/gitlab-runner/15/debian-11/prebuildfs/usr/sbin/install_packages index 2c915f265c9d..77857a1a57f2 100755 --- a/bitnami/gitlab-runner/15/debian-11/prebuildfs/usr/sbin/install_packages +++ b/bitnami/gitlab-runner/15/debian-11/prebuildfs/usr/sbin/install_packages @@ -1,9 +1,10 @@ #!/bin/sh -set -e -set -u -export DEBIAN_FRONTEND=noninteractive +set -eu + n=0 max=2 +export DEBIAN_FRONTEND=noninteractive + until [ $n -gt $max ]; do set +e ( diff --git a/bitnami/gitlab-runner/15/debian-11/tags-info.yaml b/bitnami/gitlab-runner/15/debian-11/tags-info.yaml index 6155f13c1101..7613b141c2e3 100644 --- a/bitnami/gitlab-runner/15/debian-11/tags-info.yaml +++ b/bitnami/gitlab-runner/15/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "15" - "15-debian-11" - - "15.3.0" + - "15.4.0" - "latest" diff --git a/bitnami/gitlab-runner/README.md b/bitnami/gitlab-runner/README.md index 422859cb4f93..9431bd38aa25 100644 --- a/bitnami/gitlab-runner/README.md +++ b/bitnami/gitlab-runner/README.md @@ -35,7 +35,7 @@ $ docker-compose up -d 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/). -* [`15`, `15-debian-11`, `15.3.0`, `15.3.0-debian-11-r9`, `latest` (15/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/gitlab-runner/15/debian-11/ Dockerfile) +* [`15`, `15-debian-11`, `15.4.0`, `15.4.0-debian-11-r0`, `latest` (15/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/gitlab-runner/15/debian-11/ Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).