7.10.2-debian-10-r187 release
This commit is contained in:
parent
5884551d90
commit
b270933e25
|
|
@ -10,15 +10,15 @@ ENV HOME="/" \
|
|||
COPY prebuildfs /
|
||||
# Install required system packages and dependencies
|
||||
RUN install_packages acl ca-certificates curl gzip libc6 libgcc1 libstdc++6 procps tar
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "3.4.1-0" --checksum c88c76a7b5214407821771e5fc340f0320d5ded19eada938629603a982b8b640
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "4.12.0-0" --checksum 431d61b51a6451b6896af533581d40e0f4d28732d9eca6145ec109b178c7049c
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "kibana" "7.10.2-2" --checksum c58a9d8bb5509cedf11096eeacd21044b05466a226989c6046dc6c4bf190908f
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "kibana" "7.10.2-3" --checksum 91416851cee9f6dff3bb5a60878cc99cc60f7fcb9f7ffb1346d82126914cecfa
|
||||
RUN chmod g+rwX /opt/bitnami
|
||||
|
||||
COPY rootfs /
|
||||
RUN /opt/bitnami/scripts/kibana/postunpack.sh
|
||||
ENV BITNAMI_APP_NAME="kibana" \
|
||||
BITNAMI_IMAGE_VERSION="7.10.2-debian-10-r186"
|
||||
BITNAMI_IMAGE_VERSION="7.10.2-debian-10-r187"
|
||||
|
||||
EXPOSE 5601
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
},
|
||||
"kibana": {
|
||||
"arch": "amd64",
|
||||
"digest": "c58a9d8bb5509cedf11096eeacd21044b05466a226989c6046dc6c4bf190908f",
|
||||
"digest": "91416851cee9f6dff3bb5a60878cc99cc60f7fcb9f7ffb1346d82126914cecfa",
|
||||
"distro": "debian-10",
|
||||
"type": "NAMI",
|
||||
"version": "7.10.2-2"
|
||||
"version": "7.10.2-3"
|
||||
},
|
||||
"yq": {
|
||||
"arch": "amd64",
|
||||
"digest": "c88c76a7b5214407821771e5fc340f0320d5ded19eada938629603a982b8b640",
|
||||
"digest": "431d61b51a6451b6896af533581d40e0f4d28732d9eca6145ec109b178c7049c",
|
||||
"distro": "debian-10",
|
||||
"type": "NAMI",
|
||||
"version": "3.4.1-0"
|
||||
"version": "4.12.0-0"
|
||||
}
|
||||
}
|
||||
|
|
@ -97,18 +97,32 @@ kibana_initialize() {
|
|||
# Arguments:
|
||||
# $1 - key
|
||||
# $2 - value
|
||||
# $3 - YAML type (string, int or bool)
|
||||
# Returns:
|
||||
# None
|
||||
#########################
|
||||
kibana_conf_set() {
|
||||
local key="${1:?missing key}"
|
||||
local value="${2:?missing value}"
|
||||
local -r key="${1:?Missing key}"
|
||||
local -r value="${2:-}"
|
||||
local -r type="${3:-string}"
|
||||
local -r tempfile=$(mktemp)
|
||||
|
||||
if [[ -s "$KIBANA_CONF_FILE" ]]; then
|
||||
yq w -i "$KIBANA_CONF_FILE" "$key" "$value"
|
||||
else
|
||||
yq n "$key" "$value" >"$KIBANA_CONF_FILE"
|
||||
fi
|
||||
case "$type" in
|
||||
string)
|
||||
yq eval "(.${key}) |= \"${value}\"" "$KIBANA_CONF_FILE" >"$tempfile"
|
||||
;;
|
||||
int)
|
||||
yq eval "(.${key}) |= (\"${value}\" | tonumber)" "$KIBANA_CONF_FILE" >"$tempfile"
|
||||
;;
|
||||
bool)
|
||||
yq eval "(.${key}) |= (\"${value}\" | test(\"true\"))" "$KIBANA_CONF_FILE" >"$tempfile"
|
||||
;;
|
||||
*)
|
||||
error "Type unknown: ${type}"
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
cp "$tempfile" "$KIBANA_CONF_FILE"
|
||||
}
|
||||
|
||||
########################
|
||||
|
|
@ -124,7 +138,7 @@ kibana_conf_get() {
|
|||
local key="${1:?missing key}"
|
||||
|
||||
if [[ -r "$KIBANA_CONF_FILE" ]]; then
|
||||
yq r "$KIBANA_CONF_FILE" "$key"
|
||||
yq eval ".${key}" "$KIBANA_CONF_FILE"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -205,7 +219,7 @@ is_kibana_ready() {
|
|||
# Therefore, we must check the value is not 'true'
|
||||
[[ ! "$rewriteBasePath" = "false" ]] && basePath=$(kibana_conf_get "[server.basePath]")
|
||||
if is_kibana_running; then
|
||||
local -r state="$(yq r - "status.overall.state" <<< "$(curl -s "127.0.0.1:${KIBANA_PORT_NUMBER}${basePath:-}/api/status")")"
|
||||
local -r state="$(yq eval ".status.overall.state" <<<"$(curl -s "127.0.0.1:${KIBANA_PORT_NUMBER}${basePath:-}/api/status")")"
|
||||
[[ "$state" = "green" ]]
|
||||
else
|
||||
false
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
|
|||
|
||||
|
||||
* [`7`, `7-debian-10`, `7.13.4`, `7.13.4-debian-10-r18`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/7.13.4-debian-10-r18/7/debian-10/Dockerfile)
|
||||
* [`7.10.2`, `7.10.2-debian-10`, `7.10.2-debian-10-r186` (7.10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/7.10.2-debian-10-r186/7.10.2/debian-10/Dockerfile)
|
||||
* [`7.10.2`, `7.10.2-debian-10`, `7.10.2-debian-10-r187` (7.10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/7.10.2-debian-10-r187/7.10.2/debian-10/Dockerfile)
|
||||
* [`6`, `6-debian-10`, `6.8.18`, `6.8.18-debian-10-r20` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/6.8.18-debian-10-r20/6/debian-10/Dockerfile)
|
||||
|
||||
Subscribe to project updates by watching the [bitnami/kibana GitHub repo](https://github.com/bitnami/bitnami-docker-kibana).
|
||||
|
|
|
|||
Loading…
Reference in New Issue