diff --git a/README.md b/README.md index d447c6e51..9fadbd7eb 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Please also follow usage instructions of each Zabbix component image: * [zabbix-proxy-sqlite3](https://hub.docker.com/r/zabbix/zabbix-proxy-sqlite3/) - Zabbix proxy with SQLite3 database support * [zabbix-proxy-mysql](https://hub.docker.com/r/zabbix/zabbix-proxy-mysql/) - Zabbix proxy with MySQL database support * [zabbix-java-gateway](https://hub.docker.com/r/zabbix/zabbix-java-gateway/) - Zabbix Java Gateway -* [zabbix-zabbix-web-service](https://hub.docker.com/r/zabbix/zabbix-web-service/) - Zabbix web servce for performing various tasks using headless web browser (for example, reporting) +* [zabbix-zabbix-web-service](https://hub.docker.com/r/zabbix/zabbix-web-service/) - Zabbix web service for performing various tasks using headless web browser (for example, reporting) * [zabbix-snmptraps](https://hub.docker.com/r/zabbix/zabbix-snmptraps/) - Additional container image for Zabbix server and Zabbix proxy to support SNMP traps ## Issues and Wiki diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 0368146ee..bca8b7beb 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -48,7 +48,8 @@ RUN set -eux && \ apk add --clean-protected --no-cache \ bash \ openjdk8-jre-base && \ - rm -rf /usr/sbin/zabbix_java/lib/*.xml && \ + rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \ + mv /usr/sbin/zabbix_java/lib/logback-console.xml /etc/zabbix/zabbix_java_gateway_logback.xml && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \ chgrp -R 0 /etc/zabbix/ /usr/sbin/zabbix_java/ && \ chmod -R g=u /etc/zabbix/ /usr/sbin/zabbix_java/ && \ diff --git a/java-gateway/alpine/conf/etc/zabbix/zabbix_java_gateway_logback.xml b/java-gateway/alpine/conf/etc/zabbix/zabbix_java_gateway_logback.xml deleted file mode 100644 index 750f3506f..000000000 --- a/java-gateway/alpine/conf/etc/zabbix/zabbix_java_gateway_logback.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - diff --git a/java-gateway/alpine/docker-entrypoint.sh b/java-gateway/alpine/docker-entrypoint.sh index 01ac14cd1..c2bea7442 100755 --- a/java-gateway/alpine/docker-entrypoint.sh +++ b/java-gateway/alpine/docker-entrypoint.sh @@ -18,14 +18,10 @@ prepare_java_gateway_config() { ZBX_GATEWAY_CONFIG=$ZABBIX_ETC_DIR/zabbix_java_gateway_logback.xml - if [ -n "${ZBX_DEBUGLEVEL}" ]; then - echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated" - if [ -f "$ZBX_GATEWAY_CONFIG" ]; then - sed -i -e "/^.*/" "$ZBX_GATEWAY_CONFIG" - else - echo "**** Zabbix Java Gateway log configuration file '$ZBX_GATEWAY_CONFIG' not found" - fi - fi + : ${ZBX_DEBUGLEVEL:="info"} + + echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated" + sed -i -e "/^.*/" "$ZBX_GATEWAY_CONFIG" } prepare_java_gateway() { diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile index a32d56b10..20428a2f9 100644 --- a/java-gateway/centos/Dockerfile +++ b/java-gateway/centos/Dockerfile @@ -38,8 +38,6 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati org.opencontainers.image.version="${ZBX_VERSION}" \ org.opencontainers.image.source="${ZBX_SOURCES}" -COPY ["conf/etc/", "/etc/"] - RUN set -eux && \ dnf --quiet makecache && \ dnf -y install --setopt=tsflags=nodocs --setopt=install_weak_deps=False --best \ @@ -67,7 +65,8 @@ RUN set -eux && \ mkdir -p /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/bin /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \ - rm -rf /usr/sbin/zabbix_java/lib/*.xml && \ + rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \ + mv /usr/sbin/zabbix_java/lib/logback-console.xml /etc/zabbix/zabbix_java_gateway_logback.xml && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ dnf -y history undo `dnf -q history | sed -n 3p |column -t | cut -d' ' -f1` && \ diff --git a/java-gateway/centos/conf/etc/zabbix/zabbix_java_gateway_logback.xml b/java-gateway/centos/conf/etc/zabbix/zabbix_java_gateway_logback.xml deleted file mode 100644 index 750f3506f..000000000 --- a/java-gateway/centos/conf/etc/zabbix/zabbix_java_gateway_logback.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - diff --git a/java-gateway/centos/docker-entrypoint.sh b/java-gateway/centos/docker-entrypoint.sh index 01ac14cd1..c2bea7442 100755 --- a/java-gateway/centos/docker-entrypoint.sh +++ b/java-gateway/centos/docker-entrypoint.sh @@ -18,14 +18,10 @@ prepare_java_gateway_config() { ZBX_GATEWAY_CONFIG=$ZABBIX_ETC_DIR/zabbix_java_gateway_logback.xml - if [ -n "${ZBX_DEBUGLEVEL}" ]; then - echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated" - if [ -f "$ZBX_GATEWAY_CONFIG" ]; then - sed -i -e "/^.*/" "$ZBX_GATEWAY_CONFIG" - else - echo "**** Zabbix Java Gateway log configuration file '$ZBX_GATEWAY_CONFIG' not found" - fi - fi + : ${ZBX_DEBUGLEVEL:="info"} + + echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated" + sed -i -e "/^.*/" "$ZBX_GATEWAY_CONFIG" } prepare_java_gateway() { diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index ab3123fed..358696103 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -46,7 +46,8 @@ RUN set -eux && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \ openjdk-8-jre-headless && \ - rm -rf /usr/sbin/zabbix_java/lib/*.xml && \ + rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \ + mv /usr/sbin/zabbix_java/lib/logback-console.xml /etc/zabbix/zabbix_java_gateway_logback.xml && \ apt-get -y autoremove && \ apt-get -y clean && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \ diff --git a/java-gateway/ubuntu/conf/etc/zabbix/zabbix_java_gateway_logback.xml b/java-gateway/ubuntu/conf/etc/zabbix/zabbix_java_gateway_logback.xml deleted file mode 100644 index 750f3506f..000000000 --- a/java-gateway/ubuntu/conf/etc/zabbix/zabbix_java_gateway_logback.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - diff --git a/java-gateway/ubuntu/docker-entrypoint.sh b/java-gateway/ubuntu/docker-entrypoint.sh index 01ac14cd1..c2bea7442 100755 --- a/java-gateway/ubuntu/docker-entrypoint.sh +++ b/java-gateway/ubuntu/docker-entrypoint.sh @@ -18,14 +18,10 @@ prepare_java_gateway_config() { ZBX_GATEWAY_CONFIG=$ZABBIX_ETC_DIR/zabbix_java_gateway_logback.xml - if [ -n "${ZBX_DEBUGLEVEL}" ]; then - echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated" - if [ -f "$ZBX_GATEWAY_CONFIG" ]; then - sed -i -e "/^.*/" "$ZBX_GATEWAY_CONFIG" - else - echo "**** Zabbix Java Gateway log configuration file '$ZBX_GATEWAY_CONFIG' not found" - fi - fi + : ${ZBX_DEBUGLEVEL:="info"} + + echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated" + sed -i -e "/^.*/" "$ZBX_GATEWAY_CONFIG" } prepare_java_gateway() { diff --git a/web-service/alpine/Dockerfile b/web-service/alpine/Dockerfile index 4909a41ee..75bda9525 100644 --- a/web-service/alpine/Dockerfile +++ b/web-service/alpine/Dockerfile @@ -16,7 +16,7 @@ LABEL org.opencontainers.image.title="Zabbix web service" \ org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.vendor="Zabbix LLC" \ org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.description="Zabbix web servce for performing various tasks using headless web browser" \ + org.opencontainers.image.description="Zabbix web service for performing various tasks using headless web browser" \ org.opencontainers.image.licenses="GPL v2.0" \ org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ org.opencontainers.image.version="${ZBX_VERSION}" \ diff --git a/web-service/alpine/README.md b/web-service/alpine/README.md index 9f6769ba2..892b10a72 100644 --- a/web-service/alpine/README.md +++ b/web-service/alpine/README.md @@ -10,7 +10,7 @@ For more information and related downloads for Zabbix components, please visit h # What is Zabbix web service? -Zabbix web servce for performing various tasks using headless web browser (for example, reporting). +Zabbix web service for performing various tasks using headless web browser (for example, reporting). # Zabbix web service images diff --git a/web-service/centos/Dockerfile b/web-service/centos/Dockerfile index bf54ebe14..2bb527780 100644 --- a/web-service/centos/Dockerfile +++ b/web-service/centos/Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.title="Zabbix web service" \ org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.vendor="Zabbix LLC" \ org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.description="Zabbix web servce for performing various tasks using headless web browser" \ + org.opencontainers.image.description="Zabbix web service for performing various tasks using headless web browser" \ org.opencontainers.image.licenses="GPL v2.0" STOPSIGNAL SIGTERM diff --git a/web-service/centos/README.md b/web-service/centos/README.md index 9f6769ba2..892b10a72 100644 --- a/web-service/centos/README.md +++ b/web-service/centos/README.md @@ -10,7 +10,7 @@ For more information and related downloads for Zabbix components, please visit h # What is Zabbix web service? -Zabbix web servce for performing various tasks using headless web browser (for example, reporting). +Zabbix web service for performing various tasks using headless web browser (for example, reporting). # Zabbix web service images diff --git a/web-service/ol/Dockerfile b/web-service/ol/Dockerfile index d2d724940..92beeef0d 100644 --- a/web-service/ol/Dockerfile +++ b/web-service/ol/Dockerfile @@ -16,7 +16,7 @@ LABEL org.opencontainers.image.title="Zabbix web service" \ org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.vendor="Zabbix LLC" \ org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.description="Zabbix web servce for performing various tasks using headless web browser" \ + org.opencontainers.image.description="Zabbix web service for performing various tasks using headless web browser" \ org.opencontainers.image.licenses="GPL v2.0" \ org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ org.opencontainers.image.version="${ZBX_VERSION}" \ diff --git a/web-service/ol/README.md b/web-service/ol/README.md index 9f6769ba2..892b10a72 100644 --- a/web-service/ol/README.md +++ b/web-service/ol/README.md @@ -10,7 +10,7 @@ For more information and related downloads for Zabbix components, please visit h # What is Zabbix web service? -Zabbix web servce for performing various tasks using headless web browser (for example, reporting). +Zabbix web service for performing various tasks using headless web browser (for example, reporting). # Zabbix web service images diff --git a/web-service/rhel/Dockerfile b/web-service/rhel/Dockerfile index 70aa9dcb2..38cc45bc1 100644 --- a/web-service/rhel/Dockerfile +++ b/web-service/rhel/Dockerfile @@ -14,17 +14,17 @@ LABEL name="zabbix/zabbix-web-service-trunk" \ version="${MAJOR_VERSION}" \ release="${RELEASE}" \ summary="Zabbix web service" \ - description="Zabbix web servce for performing various tasks using headless web browser" \ + description="Zabbix web service for performing various tasks using headless web browser" \ url="https://www.zabbix.com/" \ run="docker run --name zabbix-web-service --link zabbix-server:zabbix-server -p 10053:10053 -d registry.connect.redhat.com/zabbix/zabbix-web-service-trunk:${ZBX_VERSION}" \ - io.k8s.description="Zabbix web servce for performing various tasks using headless web browser" \ + io.k8s.description="Zabbix web service for performing various tasks using headless web browser" \ io.k8s.display-name="Zabbix web service" \ io.openshift.expose-services="10053:10053" \ io.openshift.tags="zabbix,zabbix-web-service" \ org.label-schema.name="zabbix-web-service-rhel" \ org.label-schema.vendor="Zabbix LLC" \ org.label-schema.url="https://zabbix.com/" \ - org.label-schema.description="Zabbix web servce for performing various tasks using headless web browser" \ + org.label-schema.description="Zabbix web service for performing various tasks using headless web browser" \ org.label-schema.vcs-ref="${VCS_REF}" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.schema-version="1.0" \ diff --git a/web-service/rhel/README.md b/web-service/rhel/README.md index 9f6769ba2..892b10a72 100644 --- a/web-service/rhel/README.md +++ b/web-service/rhel/README.md @@ -10,7 +10,7 @@ For more information and related downloads for Zabbix components, please visit h # What is Zabbix web service? -Zabbix web servce for performing various tasks using headless web browser (for example, reporting). +Zabbix web service for performing various tasks using headless web browser (for example, reporting). # Zabbix web service images diff --git a/web-service/ubuntu/Dockerfile b/web-service/ubuntu/Dockerfile index 8cf90e286..957f38c67 100644 --- a/web-service/ubuntu/Dockerfile +++ b/web-service/ubuntu/Dockerfile @@ -16,7 +16,7 @@ LABEL org.opencontainers.image.title="Zabbix web service" \ org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.vendor="Zabbix LLC" \ org.opencontainers.image.url="https://zabbix.com/" \ - org.opencontainers.image.description="Zabbix web servce for performing various tasks using headless web browser" \ + org.opencontainers.image.description="Zabbix web service for performing various tasks using headless web browser" \ org.opencontainers.image.licenses="GPL v2.0" \ org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ org.opencontainers.image.version="${ZBX_VERSION}" \ diff --git a/web-service/ubuntu/README.md b/web-service/ubuntu/README.md index 9f6769ba2..892b10a72 100644 --- a/web-service/ubuntu/README.md +++ b/web-service/ubuntu/README.md @@ -10,7 +10,7 @@ For more information and related downloads for Zabbix components, please visit h # What is Zabbix web service? -Zabbix web servce for performing various tasks using headless web browser (for example, reporting). +Zabbix web service for performing various tasks using headless web browser (for example, reporting). # Zabbix web service images