Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-08 02:37:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

2.4.41-ol-7-r184 release

Browse Source
This commit is contained in:
Bitnami Bot
2020-02-03 22:59:30 +00:00
parent 2a4d0e8256
commit 135da159b4
3 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/apache/2.4/ol-7/Dockerfile
View File

@@ -18,7 +18,7 @@ RUN curl --silent -L https://github.com/bitnami/render-template/releases/downloa
COPY rootfs /
RUN /postunpack.sh
ENV BITNAMI_APP_NAME="apache" \
BITNAMI_IMAGE_VERSION="2.4.41-ol-7-r183" \
BITNAMI_IMAGE_VERSION="2.4.41-ol-7-r184" \
PATH="/opt/bitnami/apache/bin:$PATH"
EXPOSE 8080 8443

52
bitnami/apache/2.4/ol-7/prebuildfs/libfile.sh
View File

@@ -5,18 +5,56 @@
# Functions
########################
# Ensure a line exists in the file by replacing a matching line.
# Replace a regex in a file
# Arguments:
# $1 - filename
# $2 - line
# $3 - match
# $2 - match regex
# $3 - substitute regex
# $4 - use POSIX regex. Default: true
# Returns:
# None
#########################
file_contains_line() {
replace_in_file() {
local filename="${1:?filename is required}"
local line="${2:?line is required}"
local match="${3:?match is required}"
local match_regex="${2:?match regex is required}"
local substitute_regex="${3:?substitute regex is required}"
local posix_regex=${4:-true}
sed --in-place "s/^$match\$/$line/" "$filename"
local result
# 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
if [[ $posix_regex = true ]]; then
result="$(sed -E "s@$match_regex@$substitute_regex@g" "$filename")"
else
result="$(sed "s@$match_regex@$substitute_regex@g" "$filename")"
fi
echo "$result" > "$filename"
}
########################
# Remove a line in a file based on a regex
# Arguments:
# $1 - filename
# $2 - match regex
# $3 - use POSIX regex. Default: true
# Returns:
# None
#########################
remove_in_file() {
local filename="${1:?filename is required}"
local match_regex="${2:?match regex is required}"
local posix_regex=${3:-true}
local result
# 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
if [[ $posix_regex = true ]]; then
result="$(sed -E "/$match_regex/d" "$filename")"
else
result="$(sed "/$match_regex/d" "$filename")"
fi
echo "$result" > "$filename"
}

2
bitnami/apache/README.md
View File

@@ -45,7 +45,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/).
* [`2.4-ol-7`, `2.4.41-ol-7-r183` (2.4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.41-ol-7-r183/2.4/ol-7/Dockerfile)
* [`2.4-ol-7`, `2.4.41-ol-7-r184` (2.4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.41-ol-7-r184/2.4/ol-7/Dockerfile)
* [`2.4-debian-10`, `2.4.41-debian-10-r9`, `2.4`, `2.4.41`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.41-debian-10-r9/2.4/debian-10/Dockerfile)
Subscribe to project updates by watching the [bitnami/apache GitHub repo](https://github.com/bitnami/bitnami-docker-apache).