2.8.3-debian-10-r0 release

This commit is contained in:
Bitnami Bot
2021-10-12 15:27:06 +00:00
parent 415e64ce49
commit d204d914b4
4 changed files with 49 additions and 6 deletions

View File

@@ -10,14 +10,14 @@ COPY prebuildfs /
# Install required system packages and dependencies # Install required system packages and dependencies
RUN install_packages acl ca-certificates curl gzip libc6 libgcc1 procps tar RUN install_packages acl ca-certificates curl gzip libc6 libgcc1 procps tar
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.302-0" --checksum 59c0b7440797c7110c76959dbbce5235359b52adf62f99218b2718c04f2d67b6 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.302-0" --checksum 59c0b7440797c7110c76959dbbce5235359b52adf62f99218b2718c04f2d67b6
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "spring-cloud-dataflow-composed-task-runner" "2.8.2-0" --checksum 7fa32b2c89d1b22feb39f55b9e7b7ee8521322fd515e2fdb71c3807f8f6e9972 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "spring-cloud-dataflow-composed-task-runner" "2.8.3-0" --checksum 234c186c20cee007e7a30e2e8a814bb8ca92b09e5f759175050add6c42e63f18
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e
RUN chmod g+rwX /opt/bitnami RUN chmod g+rwX /opt/bitnami
RUN mkdir /.m2 && chmod -R g+rwX /.m2 RUN mkdir /.m2 && chmod -R g+rwX /.m2
COPY rootfs / COPY rootfs /
ENV BITNAMI_APP_NAME="spring-cloud-dataflow-composed-task-runner" \ ENV BITNAMI_APP_NAME="spring-cloud-dataflow-composed-task-runner" \
BITNAMI_IMAGE_VERSION="2.8.2-debian-10-r41" \ BITNAMI_IMAGE_VERSION="2.8.3-debian-10-r0" \
PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH" PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
USER 1001 USER 1001

View File

@@ -15,9 +15,9 @@
}, },
"spring-cloud-dataflow-composed-task-runner": { "spring-cloud-dataflow-composed-task-runner": {
"arch": "amd64", "arch": "amd64",
"digest": "7fa32b2c89d1b22feb39f55b9e7b7ee8521322fd515e2fdb71c3807f8f6e9972", "digest": "234c186c20cee007e7a30e2e8a814bb8ca92b09e5f759175050add6c42e63f18",
"distro": "debian-10", "distro": "debian-10",
"type": "NAMI", "type": "NAMI",
"version": "2.8.2-0" "version": "2.8.3-0"
} }
} }

View File

@@ -39,18 +39,24 @@ group_exists() {
# Arguments: # Arguments:
# $1 - group # $1 - group
# Flags: # Flags:
# -i|--gid - the ID for the new group
# -s|--system - Whether to create new user as system user (uid <= 999) # -s|--system - Whether to create new user as system user (uid <= 999)
# Returns: # Returns:
# None # None
######################### #########################
ensure_group_exists() { ensure_group_exists() {
local group="${1:?group is missing}" local group="${1:?group is missing}"
local gid=""
local is_system_user=false local is_system_user=false
# Validate arguments # Validate arguments
shift 1 shift 1
while [ "$#" -gt 0 ]; do while [ "$#" -gt 0 ]; do
case "$1" in case "$1" in
-i|--gid)
shift
gid="${1:?missing gid}"
;;
-s|--system) -s|--system)
is_system_user=true is_system_user=true
;; ;;
@@ -64,6 +70,13 @@ ensure_group_exists() {
if ! group_exists "$group"; then if ! group_exists "$group"; then
local -a args=("$group") local -a args=("$group")
if [[ -n "$gid" ]]; then
if group_exists "$gid" ; then
error "The GID $gid is already in use." >&2
return 1
fi
args+=("--gid" "$gid")
fi
$is_system_user && args+=("--system") $is_system_user && args+=("--system")
groupadd "${args[@]}" >/dev/null 2>&1 groupadd "${args[@]}" >/dev/null 2>&1
fi fi
@@ -74,7 +87,9 @@ ensure_group_exists() {
# Arguments: # Arguments:
# $1 - user # $1 - user
# Flags: # Flags:
# -i|--uid - the ID for the new user
# -g|--group - the group the new user should belong to # -g|--group - the group the new user should belong to
# -a|--append-groups - comma-separated list of supplemental groups to append to the new user
# -h|--home - the home directory for the new user # -h|--home - the home directory for the new user
# -s|--system - whether to create new user as system user (uid <= 999) # -s|--system - whether to create new user as system user (uid <= 999)
# Returns: # Returns:
@@ -82,7 +97,9 @@ ensure_group_exists() {
######################### #########################
ensure_user_exists() { ensure_user_exists() {
local user="${1:?user is missing}" local user="${1:?user is missing}"
local uid=""
local group="" local group=""
local append_groups=""
local home="" local home=""
local is_system_user=false local is_system_user=false
@@ -90,10 +107,18 @@ ensure_user_exists() {
shift 1 shift 1
while [ "$#" -gt 0 ]; do while [ "$#" -gt 0 ]; do
case "$1" in case "$1" in
-i|--uid)
shift
uid="${1:?missing uid}"
;;
-g|--group) -g|--group)
shift shift
group="${1:?missing group}" group="${1:?missing group}"
;; ;;
-a|--append-groups)
shift
append_groups="${1:?missing append_groups}"
;;
-h|--home) -h|--home)
shift shift
home="${1:?missing home directory}" home="${1:?missing home directory}"
@@ -111,7 +136,15 @@ ensure_user_exists() {
if ! user_exists "$user"; then if ! user_exists "$user"; then
local -a user_args=("-N" "$user") local -a user_args=("-N" "$user")
$is_system_user && user_args+=("--system") if [[ -n "$uid" ]]; then
if user_exists "$uid" ; then
error "The UID $uid is already in use."
return 1
fi
user_args+=("--uid" "$uid")
else
$is_system_user && user_args+=("--system")
fi
useradd "${user_args[@]}" >/dev/null 2>&1 useradd "${user_args[@]}" >/dev/null 2>&1
fi fi
@@ -122,6 +155,15 @@ ensure_user_exists() {
usermod -g "$group" "$user" >/dev/null 2>&1 usermod -g "$group" "$user" >/dev/null 2>&1
fi fi
if [[ -n "$append_groups" ]]; then
local -a groups
read -ra groups <<< "$(tr ',;' ' ' <<< "$append_groups")"
for group in "${groups[@]}"; do
ensure_group_exists "$group"
usermod -aG "$group" "$user" >/dev/null 2>&1
done
fi
if [[ -n "$home" ]]; then if [[ -n "$home" ]]; then
mkdir -p "$home" mkdir -p "$home"
usermod -d "$home" "$user" >/dev/null 2>&1 usermod -d "$home" "$user" >/dev/null 2>&1
@@ -403,3 +445,4 @@ generate_sha_hash() {
local -r algorithm="${2:-1}" local -r algorithm="${2:-1}"
echo -n "$str" | "sha${algorithm}sum" | awk '{print $1}' echo -n "$str" | "sha${algorithm}sum" | awk '{print $1}'
} }

View File

@@ -28,7 +28,7 @@ $ docker run --name spring-cloud-dataflow-composed-task-runner bitnami/spring-cl
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/). 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/).
* [`2`, `2-debian-10`, `2.8.2`, `2.8.2-debian-10-r41`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner/blob/2.8.2-debian-10-r41/2/debian-10/Dockerfile) * [`2`, `2-debian-10`, `2.8.3`, `2.8.3-debian-10-r0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner/blob/2.8.3-debian-10-r0/2/debian-10/Dockerfile)
Subscribe to project updates by watching the [bitnami/spring-cloud-dataflow-composed-task-runner GitHub repo](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner). Subscribe to project updates by watching the [bitnami/spring-cloud-dataflow-composed-task-runner GitHub repo](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner).