[bitnami/odoo] Release 15.0.20230710-debian-11-r9 (#41678)
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
parent
786d4415b1
commit
fe07fdc84a
|
|
@ -5,17 +5,17 @@ FROM docker.io/bitnami/minideb:bullseye
|
|||
|
||||
ARG TARGETARCH
|
||||
|
||||
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
|
||||
org.opencontainers.image.created="2023-07-16T08:23:33Z" \
|
||||
LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
|
||||
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
|
||||
org.opencontainers.image.created="2023-07-19T21:18:14Z" \
|
||||
org.opencontainers.image.description="Application packaged by VMware, Inc" \
|
||||
org.opencontainers.image.licenses="Apache-2.0" \
|
||||
org.opencontainers.image.ref.name="15.0.20230710-debian-11-r2" \
|
||||
org.opencontainers.image.ref.name="15.0.20230710-debian-11-r9" \
|
||||
org.opencontainers.image.title="odoo" \
|
||||
org.opencontainers.image.vendor="VMware, Inc." \
|
||||
org.opencontainers.image.version="15.0.20230710"
|
||||
|
||||
ENV HOME="/" \
|
||||
OS_ARCH="${TARGETARCH:-amd64}" \
|
||||
ENV OS_ARCH="${TARGETARCH:-amd64}" \
|
||||
OS_FLAVOUR="debian-11" \
|
||||
OS_NAME="linux"
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
|
|||
"python-3.10.12-2-linux-${OS_ARCH}-debian-11" \
|
||||
"render-template-1.0.5-7-linux-${OS_ARCH}-debian-11" \
|
||||
"postgresql-client-15.3.0-1-linux-${OS_ARCH}-debian-11" \
|
||||
"node-18.16.1-0-linux-${OS_ARCH}-debian-11" \
|
||||
"node-18.17.0-0-linux-${OS_ARCH}-debian-11" \
|
||||
"odoo-15.0.20230710-0-linux-${OS_ARCH}-debian-11" \
|
||||
) && \
|
||||
for COMPONENT in "${COMPONENTS[@]}"; do \
|
||||
|
|
@ -42,7 +42,6 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
|
|||
done
|
||||
RUN apt-get update && apt-get upgrade -y && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
|
||||
RUN chmod g+rwX /opt/bitnami
|
||||
RUN if [ "$OS_ARCH" = "amd64" ]; then \
|
||||
curl -sLO "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_${OS_ARCH}.deb" && \
|
||||
echo "dfab5506104447eef2530d1adb9840ee3a67f30caaad5e9bcb8743ef2f9421bd wkhtmltox_0.12.5-1.buster_${OS_ARCH}.deb" | sha256sum -c - && \
|
||||
|
|
@ -59,6 +58,5 @@ ENV APP_VERSION="15.0.20230710" \
|
|||
|
||||
EXPOSE 3000 8069 8072
|
||||
|
||||
USER root
|
||||
ENTRYPOINT [ "/opt/bitnami/scripts/odoo/entrypoint.sh" ]
|
||||
CMD [ "/opt/bitnami/scripts/odoo/run.sh" ]
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
"arch": "amd64",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "18.16.1-0"
|
||||
"version": "18.17.0-0"
|
||||
},
|
||||
"odoo": {
|
||||
"arch": "amd64",
|
||||
|
|
|
|||
|
|
@ -187,6 +187,25 @@ validate_port() {
|
|||
fi
|
||||
}
|
||||
|
||||
########################
|
||||
# Validate if the provided argument is a valid IPv6 address
|
||||
# Arguments:
|
||||
# $1 - IP to validate
|
||||
# Returns:
|
||||
# Boolean
|
||||
#########################
|
||||
validate_ipv6() {
|
||||
local ip="${1:?ip is missing}"
|
||||
local stat=1
|
||||
local full_address_regex='^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$'
|
||||
local short_address_regex='^((([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6}::(([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6})$'
|
||||
|
||||
if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then
|
||||
stat=0
|
||||
fi
|
||||
return "$stat"
|
||||
}
|
||||
|
||||
########################
|
||||
# Validate if the provided argument is a valid IPv4 address
|
||||
# Arguments:
|
||||
|
|
@ -204,7 +223,26 @@ validate_ipv4() {
|
|||
&& ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
|
||||
stat=$?
|
||||
fi
|
||||
return $stat
|
||||
return "$stat"
|
||||
}
|
||||
|
||||
########################
|
||||
# Validate if the provided argument is a valid IPv4 or IPv6 address
|
||||
# Arguments:
|
||||
# $1 - IP to validate
|
||||
# Returns:
|
||||
# Boolean
|
||||
#########################
|
||||
validate_ip() {
|
||||
local ip="${1:?ip is missing}"
|
||||
local stat=1
|
||||
|
||||
if validate_ipv4 "$ip"; then
|
||||
stat=0
|
||||
else
|
||||
stat=$(validate_ipv6 "$ip")
|
||||
fi
|
||||
return "$stat"
|
||||
}
|
||||
|
||||
########################
|
||||
|
|
|
|||
Loading…
Reference in New Issue