mirror of
https://github.com/bitnami/containers.git
synced 2026-03-14 06:48:11 +08:00
[bitnami/gitlab-runner-helper] Release 15.4.0-debian-11-r7 (#9877)
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
@@ -4,7 +4,7 @@ ARG TARGETARCH
|
|||||||
|
|
||||||
LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
|
LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
|
||||||
org.opencontainers.image.description="Application packaged by Bitnami" \
|
org.opencontainers.image.description="Application packaged by Bitnami" \
|
||||||
org.opencontainers.image.ref.name="15.4.0-debian-11-r6" \
|
org.opencontainers.image.ref.name="15.4.0-debian-11-r7" \
|
||||||
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/gitlab-runner-helper" \
|
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/gitlab-runner-helper" \
|
||||||
org.opencontainers.image.title="gitlab-runner-helper" \
|
org.opencontainers.image.title="gitlab-runner-helper" \
|
||||||
org.opencontainers.image.vendor="VMware, Inc." \
|
org.opencontainers.image.vendor="VMware, Inc." \
|
||||||
@@ -32,7 +32,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
|
|||||||
fi && \
|
fi && \
|
||||||
sha256sum -c "${COMPONENT}.tar.gz.sha256" && \
|
sha256sum -c "${COMPONENT}.tar.gz.sha256" && \
|
||||||
tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
|
tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
|
||||||
rm -rf "${COMPONENT}.tar.gz{,sha256}" ; \
|
rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
|
||||||
done
|
done
|
||||||
RUN apt-get autoremove --purge -y curl && \
|
RUN apt-get autoremove --purge -y curl && \
|
||||||
apt-get update && apt-get upgrade -y && \
|
apt-get update && apt-get upgrade -y && \
|
||||||
|
|||||||
@@ -519,7 +519,7 @@ get_machine_id() {
|
|||||||
get_disk_device_id() {
|
get_disk_device_id() {
|
||||||
local device_id=""
|
local device_id=""
|
||||||
if grep -q ^/dev /proc/mounts; then
|
if grep -q ^/dev /proc/mounts; then
|
||||||
device_id="$(grep -q ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)"
|
device_id="$(grep ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)"
|
||||||
fi
|
fi
|
||||||
# If it could not be autodetected, fallback to /dev/sda1 as a default
|
# If it could not be autodetected, fallback to /dev/sda1 as a default
|
||||||
if [[ -z "$device_id" || ! -b "$device_id" ]]; then
|
if [[ -z "$device_id" || ! -b "$device_id" ]]; then
|
||||||
@@ -538,7 +538,7 @@ get_disk_device_id() {
|
|||||||
# Root disk ID
|
# Root disk ID
|
||||||
#########################
|
#########################
|
||||||
get_root_disk_device_id() {
|
get_root_disk_device_id() {
|
||||||
get_disk_device_id | sed 's/[0-9]\+$//'
|
get_disk_device_id | sed -E 's/p?[0-9]+$//'
|
||||||
}
|
}
|
||||||
|
|
||||||
########################
|
########################
|
||||||
|
|||||||
Reference in New Issue
Block a user