public_git/bitnami-containers
1
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-10-18 01:28:47 +02:00
Code Issues Projects Releases Wiki Activity

[bitnami/argo-cd] Release 2.6.7-debian-11-r3 (#31991)

Browse Source 
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2023-04-29 17:12:18 +01:00
committed by GitHub
parent bc11dc6b6c
commit 4309b2aa9e
5 changed files with 118 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/argo-cd/2/debian-11/Dockerfile
+6 -6
View File
@@ -2,11 +2,12 @@ FROM docker.io/bitnami/minideb:bullseye
ARG TARGETARCH
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
org.opencontainers.image.created="2023-04-01T10:10:33Z" \
LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
org.opencontainers.image.created="2023-04-29T15:48:03Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="2.6.7-debian-11-r2" \
org.opencontainers.image.ref.name="2.6.7-debian-11-r3" \
org.opencontainers.image.title="argo-cd" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="2.6.7"
@@ -22,8 +23,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN install_packages ca-certificates curl git git-lfs gnupg openssh-client procps
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \
"gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \
"argo-cd-2.6.7-1-linux-${OS_ARCH}-debian-11" \
"argo-cd-2.6.7-3-linux-${OS_ARCH}-debian-11" \
) && \
for COMPONENT in "${COMPONENTS[@]}"; do \
if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -43,7 +43,7 @@ COPY rootfs /
RUN /opt/bitnami/scripts/argo-cd/postunpack.sh
ENV APP_VERSION="2.6.7" \
BITNAMI_APP_NAME="argo-cd" \
PATH="/opt/bitnami/common/bin:/opt/bitnami/argo-cd/bin:/opt/bitnami/argo-cd/hack:/opt/bitnami/helm/bin:/opt/bitnami/ksonnet/bin:/opt/bitnami/kustomize/bin:$PATH"
PATH="/opt/bitnami/argo-cd/bin:/opt/bitnami/argo-cd/hack:/opt/bitnami/helm/bin:/opt/bitnami/ksonnet/bin:/opt/bitnami/kustomize/bin:$PATH"
USER 1001
ENTRYPOINT [ "/opt/bitnami/scripts/argo-cd/entrypoint.sh" ]
bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+1 -7
View File
@@ -3,12 +3,6 @@
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "2.6.7-1"
},
"gosu": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "1.16.0-5"
"version": "2.6.7-3"
}
}
bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+95
View File
@@ -553,3 +553,98 @@ get_root_disk_device_id() {
get_root_disk_size() {
fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true
}
########################
# Run command as a specific user and group (optional)
# Arguments:
# $1 - USER(:GROUP) to switch to
# $2..$n - command to execute
# Returns:
# Exit code of the specified command
#########################
run_as_user() {
run_chroot "$@"
}
########################
# Execute command as a specific user and group (optional),
# replacing the current process image
# Arguments:
# $1 - USER(:GROUP) to switch to
# $2..$n - command to execute
# Returns:
# Exit code of the specified command
#########################
exec_as_user() {
run_chroot --replace-process "$@"
}
########################
# Run a command using chroot
# Arguments:
# $1 - USER(:GROUP) to switch to
# $2..$n - command to execute
# Flags:
# -r | --replace-process - Replace the current process image (optional)
# Returns:
# Exit code of the specified command
#########################
run_chroot() {
local userspec
local user
local homedir
local replace=false
local -r cwd="$(pwd)"
# Parse and validate flags
while [[ "$#" -gt 0 ]]; do
case "$1" in
-r | --replace-process)
replace=true
;;
--)
shift
break
;;
-*)
stderr_print "unrecognized flag $1"
return 1
;;
*)
break
;;
esac
shift
done
# Parse and validate arguments
if [[ "$#" -lt 2 ]]; then
echo "expected at least 2 arguments"
return 1
else
userspec=$1
shift
# userspec can optionally include the group, so we parse the user
user=$(echo "$userspec" | cut -d':' -f1)
fi
if ! am_i_root; then
error "Could not switch to '${userspec}': Operation not permitted"
return 1
fi
# Get the HOME directory for the user to switch, as chroot does
# not properly update this env and some scripts rely on it
homedir=$(eval echo "~${user}")
if [[ ! -d $homedir ]]; then
homedir="${HOME:-/}"
fi
# Obtaining value for "$@" indirectly in order to properly support shell parameter expansion
if [[ "$replace" = true ]]; then
exec chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@"
else
chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@"
fi
}
bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+12 -12
View File
@@ -112,10 +112,10 @@ is_web_server_running() {
#########################
web_server_start() {
info "Starting $(web_server_type) in background"
if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
"${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
systemctl start "bitnami.$(web_server_type).service"
else
"${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
fi
}
@@ -130,10 +130,10 @@ web_server_start() {
#########################
web_server_stop() {
info "Stopping $(web_server_type)"
if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
"${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
systemctl stop "bitnami.$(web_server_type).service"
else
"${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
fi
}
@@ -148,10 +148,10 @@ web_server_stop() {
#########################
web_server_restart() {
info "Restarting $(web_server_type)"
if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
"${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
systemctl restart "bitnami.$(web_server_type).service"
else
"${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
fi
}
@@ -165,10 +165,10 @@ web_server_restart() {
# None
#########################
web_server_reload() {
if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
"${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
systemctl reload "bitnami.$(web_server_type).service"
else
"${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
fi
}
bitnami/argo-cd/2/debian-11/rootfs/opt/bitnami/scripts/argo-cd/entrypoint.sh
+4 -1
View File
@@ -26,7 +26,10 @@ if ! am_i_root; then
export NSS_WRAPPER_PASSWD
NSS_WRAPPER_GROUP="$(mktemp)"
export NSS_WRAPPER_GROUP
echo "argocd:x:$(id -u):$(id -g):ArgoCD:/opt/bitnami/argo-cd:/bin/false" > "$NSS_WRAPPER_PASSWD"
if [[ "$HOME" == "/" ]]; then
export HOME=/opt/bitnami/argo-cd
fi
echo "argocd:x:$(id -u):$(id -g):ArgoCD:${HOME}:/bin/false" > "$NSS_WRAPPER_PASSWD"
echo "argocd:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
chmod 400 "$NSS_WRAPPER_PASSWD" "$NSS_WRAPPER_GROUP"
fi