diff --git a/bitnami/ejbca/6/debian-10/Dockerfile b/bitnami/ejbca/6/debian-10/Dockerfile index 25e107f2c93c..d2667b2ca327 100644 --- a/bitnami/ejbca/6/debian-10/Dockerfile +++ b/bitnami/ejbca/6/debian-10/Dockerfile @@ -20,7 +20,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/ejbca/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ BITNAMI_APP_NAME="ejbca" \ - BITNAMI_IMAGE_VERSION="6.15.2-6-debian-10-r333" \ + BITNAMI_IMAGE_VERSION="6.15.2-6-debian-10-r334" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh index dd47f25e4e45..41ebaf7464f6 100644 --- a/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -10,7 +10,7 @@ # Functions ######################## -# Replace a regex in a file +# Replace a regex-matching string in a file # Arguments: # $1 - filename # $2 - match regex @@ -30,7 +30,7 @@ replace_in_file() { # We should avoid using 'sed in-place' substitutions # 1) They are not compatible with files mounted from ConfigMap(s) # 2) We found incompatibility issues with Debian10 and "in-place" substitutions - del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues + local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues if [[ $posix_regex = true ]]; then result="$(sed -E "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")" else @@ -39,6 +39,26 @@ replace_in_file() { echo "$result" > "$filename" } +######################## +# Replace a regex-matching multiline string in a file +# Arguments: +# $1 - filename +# $2 - match regex +# $3 - substitute regex +# Returns: +# None +######################### +replace_in_file_multiline() { + local filename="${1:?filename is required}" + local match_regex="${2:?match regex is required}" + local substitute_regex="${3:?substitute regex is required}" + + local result + local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues + result="$(perl -pe "BEGIN{undef $/;} s${del}${match_regex}${del}${substitute_regex}${del}sg" "$filename")" + echo "$result" > "$filename" +} + ######################## # Remove a line in a file based on a regex # Arguments: diff --git a/bitnami/ejbca/README.md b/bitnami/ejbca/README.md index 44fc742abbcf..23f6e1b484c6 100644 --- a/bitnami/ejbca/README.md +++ b/bitnami/ejbca/README.md @@ -37,7 +37,7 @@ Non-root container images add an extra layer of security and are generally recom 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/). -* [`6`, `6-debian-10`, `6.15.2-6`, `6.15.2-6-debian-10-r333`, `latest` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ejbca/blob/6.15.2-6-debian-10-r333/6/debian-10/Dockerfile) +* [`6`, `6-debian-10`, `6.15.2-6`, `6.15.2-6-debian-10-r334`, `latest` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ejbca/blob/6.15.2-6-debian-10-r334/6/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/ejbca GitHub repo](https://github.com/bitnami/bitnami-docker-ejbca).