From 2b4d250ebd2b8967d531d9ac3bbf779efe422fc5 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 9 Jun 2021 19:08:54 +0300 Subject: [PATCH 1/2] Fixed Ubuntu based web dockerfile --- web-apache-pgsql/ubuntu/Dockerfile | 1 - web-nginx-pgsql/ubuntu/Dockerfile | 1 - 2 files changed, 2 deletions(-) diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index e96478c87..784ccdd68 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -84,7 +84,6 @@ RUN set -eux && \ rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \ - ./locale/make_mo.sh && \ mkdir -p /var/lib/locales/supported.d/ && \ rm -f /var/lib/locales/supported.d/local && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 152ab8185..68ba621f1 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -95,7 +95,6 @@ RUN set -eux && \ rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \ - ./locale/make_mo.sh && \ mkdir -p /var/lib/locales/supported.d/ && \ rm -f /var/lib/locales/supported.d/local && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ From 8d6e473b9ca8ca41e850c6a5fa9f70570757b99b Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 10 Jun 2021 02:19:56 +0300 Subject: [PATCH 2/2] Removed CentOS and added Oracle Linux --- .github/workflows/CI.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 85b0e9a90..eaba9edf5 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -6,7 +6,6 @@ on: - published push: branches: - - '3.0' - '4.0' - '5.0' - '5.2' @@ -48,10 +47,7 @@ jobs: os: - alpine - ubuntu - - centos - exclude: - - os: centos - build: agent2 + - ol runs-on: ubuntu-20.04 steps: