From 6ca85497b22f43deff771072d5d9046752a46b2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Jan 2023 04:09:33 +0000 Subject: [PATCH 1/7] Bump docker/build-push-action from 3 to 4 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index be6fd54..da11e88 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -149,7 +149,7 @@ jobs: - name: Build and push Docker images (Docker) if: ${{ steps.build_check.outputs.build == 'true' }} - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: push: true context: . @@ -160,7 +160,7 @@ jobs: - name: Build and push Docker images (GHCR) if: ${{ steps.build_check.outputs.build == 'true' }} - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: push: true context: . From 3f5800a4565cb985aec0eef7e2f9d67c3af4f3db Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 29 Mar 2023 14:04:10 +0300 Subject: [PATCH 2/7] Update --- SOURCES/boringssl.patch | 20 ++++---- SOURCES/lua-nginx-module-compat.patch | 19 -------- SOURCES/webkaos.patch | 66 +++++++++++++------------- webkaos.spec | 68 ++++++++------------------- 4 files changed, 63 insertions(+), 110 deletions(-) delete mode 100644 SOURCES/lua-nginx-module-compat.patch diff --git a/SOURCES/boringssl.patch b/SOURCES/boringssl.patch index be857b0..f8a7a52 100644 --- a/SOURCES/boringssl.patch +++ b/SOURCES/boringssl.patch @@ -1,17 +1,17 @@ -diff -urN nginx-1.23.1-orig/src/event/ngx_event_openssl.c nginx-1.23.1-boring/src/event/ngx_event_openssl.c ---- nginx-1.23.1-orig/src/event/ngx_event_openssl.c 2022-07-19 17:05:27.000000000 +0300 -+++ nginx-1.23.1-boring/src/event/ngx_event_openssl.c 2022-08-02 15:19:58.000000000 +0300 -@@ -3352,7 +3352,9 @@ - #ifdef SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM - || n == SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM /* 118 */ +diff -urN nginx-1.23.4-orig/src/event/ngx_event_openssl.c nginx-1.23.4/src/event/ngx_event_openssl.c +--- nginx-1.23.4-orig/src/event/ngx_event_openssl.c 2023-03-28 18:01:54.000000000 +0300 ++++ nginx-1.23.4/src/event/ngx_event_openssl.c 2023-03-29 13:53:09.000000000 +0300 +@@ -3416,7 +3416,9 @@ + #ifdef SSL_R_BAD_KEY_UPDATE + || n == SSL_R_BAD_KEY_UPDATE /* 122 */ #endif +#ifdef SSL_R_BLOCK_CIPHER_PAD_IS_WRONG || n == SSL_R_BLOCK_CIPHER_PAD_IS_WRONG /* 129 */ +#endif - || n == SSL_R_DIGEST_CHECK_FAILED /* 149 */ - || n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST /* 151 */ - || n == SSL_R_EXCESSIVE_MESSAGE_SIZE /* 152 */ -@@ -3362,7 +3364,9 @@ + || n == SSL_R_CCS_RECEIVED_EARLY /* 133 */ + #ifdef SSL_R_DECODE_ERROR + || n == SSL_R_DECODE_ERROR /* 137 */ +@@ -3444,7 +3446,9 @@ #ifdef SSL_R_NO_CIPHERS_PASSED || n == SSL_R_NO_CIPHERS_PASSED /* 182 */ #endif diff --git a/SOURCES/lua-nginx-module-compat.patch b/SOURCES/lua-nginx-module-compat.patch deleted file mode 100644 index dd960ee..0000000 --- a/SOURCES/lua-nginx-module-compat.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urN lua-nginx-module-0.10.21-orig/src/ngx_http_lua_headers_in.c lua-nginx-module-0.10.21/src/ngx_http_lua_headers_in.c ---- lua-nginx-module-0.10.21-orig/src/ngx_http_lua_headers_in.c 2022-03-02 09:54:22.000000000 +0300 -+++ lua-nginx-module-0.10.21/src/ngx_http_lua_headers_in.c 2022-07-04 14:32:05.000000000 +0300 -@@ -152,9 +152,15 @@ - ngx_http_set_builtin_header }, - #endif - -+#if defined(nginx_version) && nginx_version >= 1023000 -+ { ngx_string("Cookie"), -+ offsetof(ngx_http_headers_in_t, cookie), -+ ngx_http_set_builtin_multi_header }, -+#else - { ngx_string("Cookie"), - offsetof(ngx_http_headers_in_t, cookies), - ngx_http_set_builtin_multi_header }, -+#endif - - { ngx_null_string, 0, ngx_http_set_header } - }; diff --git a/SOURCES/webkaos.patch b/SOURCES/webkaos.patch index d057b4b..638a3ba 100644 --- a/SOURCES/webkaos.patch +++ b/SOURCES/webkaos.patch @@ -1,12 +1,12 @@ -diff -urN nginx-1.23.3-orig/auto/lib/openssl/make nginx-1.23.3/auto/lib/openssl/make ---- nginx-1.23.3-orig/auto/lib/openssl/make 2022-12-13 18:53:53.000000000 +0300 -+++ nginx-1.23.3/auto/lib/openssl/make 2023-01-16 13:05:59.968753081 +0300 -@@ -45,18 +45,18 @@ +diff -urN nginx-1.23.4-orig/auto/lib/openssl/make nginx-1.23.4/auto/lib/openssl/make +--- nginx-1.23.4-orig/auto/lib/openssl/make 2023-03-28 18:01:54.000000000 +0300 ++++ nginx-1.23.4/auto/lib/openssl/make 2023-03-29 13:08:48.000000000 +0300 +@@ -58,18 +58,18 @@ /*) ngx_prefix="$OPENSSL/.openssl" ;; *) ngx_prefix="$PWD/$OPENSSL/.openssl" ;; esac - -+ if [ ! -d "$ngx_prefix" ]; then ++ if [ ! -d "$ngx_prefix" ]; then cat << END >> $NGX_MAKEFILE $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE @@ -15,18 +15,18 @@ diff -urN nginx-1.23.3-orig/auto/lib/openssl/make nginx-1.23.3/auto/lib/openssl/ && ./config --prefix=$ngx_prefix no-shared no-threads $OPENSSL_OPT \\ - && \$(MAKE) \\ - && \$(MAKE) install_sw LIBDIR=lib -+ && \$(MAKE) -j1\\ ++ && \$(MAKE) -j1 \\ + && \$(MAKE) -j1 install_sw LIBDIR=lib END - -+ fi ++ fi ;; esac -diff -urN nginx-1.23.3-orig/src/core/nginx.c nginx-1.23.3/src/core/nginx.c ---- nginx-1.23.3-orig/src/core/nginx.c 2022-12-13 18:53:53.000000000 +0300 -+++ nginx-1.23.3/src/core/nginx.c 2023-01-16 13:05:59.974753059 +0300 +diff -urN nginx-1.23.4-orig/src/core/nginx.c nginx-1.23.4/src/core/nginx.c +--- nginx-1.23.4-orig/src/core/nginx.c 2023-03-28 18:01:54.000000000 +0300 ++++ nginx-1.23.4/src/core/nginx.c 2023-03-29 12:59:12.184527558 +0300 @@ -390,13 +390,13 @@ static void ngx_show_version_info(void) @@ -45,13 +45,13 @@ diff -urN nginx-1.23.3-orig/src/core/nginx.c nginx-1.23.3/src/core/nginx.c "Options:" NGX_LINEFEED " -?,-h : this help" NGX_LINEFEED " -v : show version and exit" NGX_LINEFEED -diff -urN nginx-1.23.3-orig/src/core/nginx.h nginx-1.23.3/src/core/nginx.h ---- nginx-1.23.3-orig/src/core/nginx.h 2022-12-13 18:53:53.000000000 +0300 -+++ nginx-1.23.3/src/core/nginx.h 2023-01-16 13:06:36.000000000 +0300 +diff -urN nginx-1.23.4-orig/src/core/nginx.h nginx-1.23.4/src/core/nginx.h +--- nginx-1.23.4-orig/src/core/nginx.h 2023-03-28 18:01:54.000000000 +0300 ++++ nginx-1.23.4/src/core/nginx.h 2023-03-29 13:09:16.000000000 +0300 @@ -11,7 +11,7 @@ - #define nginx_version 1023003 - #define NGINX_VERSION "1.23.3" + #define nginx_version 1023004 + #define NGINX_VERSION "1.23.4" -#define NGINX_VER "nginx/" NGINX_VERSION +#define NGINX_VER "webkaos/" NGINX_VERSION @@ -66,9 +66,9 @@ diff -urN nginx-1.23.3-orig/src/core/nginx.h nginx-1.23.3/src/core/nginx.h #define NGX_OLDPID_EXT ".oldbin" -diff -urN nginx-1.23.3-orig/src/core/ngx_log.c nginx-1.23.3/src/core/ngx_log.c ---- nginx-1.23.3-orig/src/core/ngx_log.c 2022-12-13 18:53:53.000000000 +0300 -+++ nginx-1.23.3/src/core/ngx_log.c 2023-01-16 13:05:59.985753018 +0300 +diff -urN nginx-1.23.4-orig/src/core/ngx_log.c nginx-1.23.4/src/core/ngx_log.c +--- nginx-1.23.4-orig/src/core/ngx_log.c 2023-03-28 18:01:54.000000000 +0300 ++++ nginx-1.23.4/src/core/ngx_log.c 2023-03-29 12:59:12.195527524 +0300 @@ -202,9 +202,9 @@ return; } @@ -99,9 +99,9 @@ diff -urN nginx-1.23.3-orig/src/core/ngx_log.c nginx-1.23.3/src/core/ngx_log.c return NGX_CONF_ERROR; #endif -diff -urN nginx-1.23.3-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.23.3/src/http/modules/ngx_http_autoindex_module.c ---- nginx-1.23.3-orig/src/http/modules/ngx_http_autoindex_module.c 2022-12-13 18:53:53.000000000 +0300 -+++ nginx-1.23.3/src/http/modules/ngx_http_autoindex_module.c 2023-01-16 13:05:59.991752996 +0300 +diff -urN nginx-1.23.4-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.23.4/src/http/modules/ngx_http_autoindex_module.c +--- nginx-1.23.4-orig/src/http/modules/ngx_http_autoindex_module.c 2023-03-28 18:01:54.000000000 +0300 ++++ nginx-1.23.4/src/http/modules/ngx_http_autoindex_module.c 2023-03-29 12:59:12.201527505 +0300 @@ -449,9 +449,11 @@ ; @@ -177,9 +177,9 @@ diff -urN nginx-1.23.3-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1 tm.ngx_tm_mday, months[tm.ngx_tm_mon - 1], tm.ngx_tm_year, -diff -urN nginx-1.23.3-orig/src/http/ngx_http_header_filter_module.c nginx-1.23.3/src/http/ngx_http_header_filter_module.c ---- nginx-1.23.3-orig/src/http/ngx_http_header_filter_module.c 2022-12-13 18:53:53.000000000 +0300 -+++ nginx-1.23.3/src/http/ngx_http_header_filter_module.c 2023-01-16 13:05:59.998752970 +0300 +diff -urN nginx-1.23.4-orig/src/http/ngx_http_header_filter_module.c nginx-1.23.4/src/http/ngx_http_header_filter_module.c +--- nginx-1.23.4-orig/src/http/ngx_http_header_filter_module.c 2023-03-28 18:01:54.000000000 +0300 ++++ nginx-1.23.4/src/http/ngx_http_header_filter_module.c 2023-03-29 12:59:12.207527487 +0300 @@ -46,7 +46,7 @@ }; @@ -230,9 +230,9 @@ diff -urN nginx-1.23.3-orig/src/http/ngx_http_header_filter_module.c nginx-1.23. #define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX) ngx_string("500 Internal Server Error"), -diff -urN nginx-1.23.3-orig/src/http/ngx_http_special_response.c nginx-1.23.3/src/http/ngx_http_special_response.c ---- nginx-1.23.3-orig/src/http/ngx_http_special_response.c 2022-12-13 18:53:53.000000000 +0300 -+++ nginx-1.23.3/src/http/ngx_http_special_response.c 2023-01-16 13:06:00.004752948 +0300 +diff -urN nginx-1.23.4-orig/src/http/ngx_http_special_response.c nginx-1.23.4/src/http/ngx_http_special_response.c +--- nginx-1.23.4-orig/src/http/ngx_http_special_response.c 2023-03-28 18:01:54.000000000 +0300 ++++ nginx-1.23.4/src/http/ngx_http_special_response.c 2023-03-29 12:59:12.214527465 +0300 @@ -19,21 +19,21 @@ @@ -705,9 +705,9 @@ diff -urN nginx-1.23.3-orig/src/http/ngx_http_special_response.c nginx-1.23.3/sr #define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX) ngx_string(ngx_http_error_494_page), /* 494, request header too large */ -diff -urN nginx-1.23.3-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.23.3/src/http/v2/ngx_http_v2_filter_module.c ---- nginx-1.23.3-orig/src/http/v2/ngx_http_v2_filter_module.c 2022-12-13 18:53:53.000000000 +0300 -+++ nginx-1.23.3/src/http/v2/ngx_http_v2_filter_module.c 2023-01-16 13:06:00.010752926 +0300 +diff -urN nginx-1.23.4-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.23.4/src/http/v2/ngx_http_v2_filter_module.c +--- nginx-1.23.4-orig/src/http/v2/ngx_http_v2_filter_module.c 2023-03-28 18:01:54.000000000 +0300 ++++ nginx-1.23.4/src/http/v2/ngx_http_v2_filter_module.c 2023-03-29 12:59:12.221527443 +0300 @@ -148,7 +148,7 @@ ngx_http_core_srv_conf_t *cscf; u_char addr[NGX_SOCKADDR_STRLEN]; @@ -726,9 +726,9 @@ diff -urN nginx-1.23.3-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.23.3 } *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX); -diff -urN nginx-1.23.3-orig/src/os/unix/ngx_setproctitle.c nginx-1.23.3/src/os/unix/ngx_setproctitle.c ---- nginx-1.23.3-orig/src/os/unix/ngx_setproctitle.c 2022-12-13 18:53:53.000000000 +0300 -+++ nginx-1.23.3/src/os/unix/ngx_setproctitle.c 2023-01-16 13:06:00.016752904 +0300 +diff -urN nginx-1.23.4-orig/src/os/unix/ngx_setproctitle.c nginx-1.23.4/src/os/unix/ngx_setproctitle.c +--- nginx-1.23.4-orig/src/os/unix/ngx_setproctitle.c 2023-03-28 18:01:54.000000000 +0300 ++++ nginx-1.23.4/src/os/unix/ngx_setproctitle.c 2023-03-29 12:59:12.227527425 +0300 @@ -89,7 +89,7 @@ ngx_os_argv[1] = NULL; diff --git a/webkaos.spec b/webkaos.spec index 1b692f8..1836420 100644 --- a/webkaos.spec +++ b/webkaos.spec @@ -8,42 +8,13 @@ ################################################################################ -%define _posixroot / -%define _root /root -%define _bin /bin -%define _sbin /sbin -%define _srv /srv -%define _home /home -%define _lib32 %{_posixroot}lib -%define _lib64 %{_posixroot}lib64 -%define _libdir32 %{_prefix}%{_lib32} -%define _libdir64 %{_prefix}%{_lib64} -%define _logdir %{_localstatedir}/log -%define _rundir %{_localstatedir}/run -%define _lockdir %{_localstatedir}/lock/subsys -%define _cachedir %{_localstatedir}/cache -%define _spooldir %{_localstatedir}/spool -%define _crondir %{_sysconfdir}/cron.d -%define _loc_prefix %{_prefix}/local -%define _loc_exec_prefix %{_loc_prefix} -%define _loc_bindir %{_loc_exec_prefix}/bin -%define _loc_libdir %{_loc_exec_prefix}/%{_lib} -%define _loc_libdir32 %{_loc_exec_prefix}/%{_lib32} -%define _loc_libdir64 %{_loc_exec_prefix}/%{_lib64} -%define _loc_libexecdir %{_loc_exec_prefix}/libexec -%define _loc_sbindir %{_loc_exec_prefix}/sbin -%define _loc_bindir %{_loc_exec_prefix}/bin -%define _loc_datarootdir %{_loc_prefix}/share -%define _loc_includedir %{_loc_prefix}/include -%define _rpmstatedir %{_sharedstatedir}/rpm-state -%define _pkgconfigdir %{_libdir}/pkgconfig - -%define __service %{_sbin}/service -%define __chkconfig %{_sbin}/chkconfig -%define __useradd %{_sbindir}/useradd -%define __groupadd %{_sbindir}/groupadd -%define __getent %{_bindir}/getent -%define __sysctl %{_bindir}/systemctl +%define _cachedir %{_localstatedir}/cache +%define _logdir %{_localstatedir}/log +%define _rundir %{_localstatedir}/run + +%define __service %{_sbin}/service +%define __chkconfig %{_sbin}/chkconfig +%define __sysctl %{_bindir}/systemctl ################################################################################ @@ -52,22 +23,22 @@ %define service_name %{name} %define service_home %{_cachedir}/%{service_name} -%define nginx_version 1.23.3 -%define lua_module_ver 0.10.22 -%define lua_resty_core_ver 0.1.24 +%define nginx_version 1.23.4 +%define lua_module_ver 0.10.24 +%define lua_resty_core_ver 0.1.26 %define lua_resty_lru_ver 0.13 %define mh_module_ver 0.34 %define pcre_ver 8.45 %define zlib_ver 1.2.13 -%define luajit_ver 2.1-20220915 +%define luajit_ver 2.1-20230119 %define luajit_raw_ver 2.1.0-beta3 %define brotli_ngx_commit 6e975bcb015f62e1f303054897783355e2a877dc %define brotli_commit 3914999fcc1fda92e750ef9190aa6db9bf7bdb07 %define naxsi_ver 1.3 -# 1. Open https://omahaproxy.appspot.com and note of linux/stable release. -# 2. Open https://chromium.googlesource.com/chromium/src/+/refs/tags//DEPS and note . -%define boring_commit 1ccef4908ce04adc6d246262846f3cd8a111fa44 +# 1. Open https://chromiumdash.appspot.com/releases?platform=Linux and note the latest stable version. +# 2. Open https://chromium.googlesource.com/chromium/src/+/refs/tags//DEPS and note . +%define boring_commit 45b8d7bbd771cbf7e116db2ba1f1cc7af959497e ################################################################################ @@ -123,7 +94,6 @@ Patch3: boringssl.patch Patch5: boringssl-tls13-support.patch Patch8: boringssl-urand-test-disable.patch -Patch11: lua-nginx-module-compat.patch Patch12: naxsi-compat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -235,10 +205,6 @@ pushd boringssl %patch8 -p1 popd -pushd lua-nginx-module-%{lua_module_ver} -%patch11 -p1 -popd - pushd naxsi-%{naxsi_ver} %patch12 -p1 popd @@ -705,6 +671,12 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Mar 29 2023 Anton Novojilov - 1.23.4-0 +- Nginx updated to 1.23.4 +- lua-nginx-module updated to 0.10.24 +- lua-resty-core updated to 0.1.26 +- BoringSSL updated to the latest stable version for Chromium + * Thu Dec 01 2022 Anton Novojilov - 1.23.3-0 - Nginx updated to 1.23.3 - zlib updated to 1.2.13 with fixes for CVE-2022-37434 From cf2b254c7328f07d731c47cb09a564f46ff37dd1 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 31 Mar 2023 00:36:46 +0300 Subject: [PATCH 3/7] Bump dynamic modules release --- webkaos.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webkaos.spec b/webkaos.spec index 1836420..297fe4f 100644 --- a/webkaos.spec +++ b/webkaos.spec @@ -152,7 +152,7 @@ Links for nginx compatibility. Summary: Module for Brotli compression Version: 0.1.5 -Release: 13%{?dist} +Release: 14%{?dist} Group: System Environment/Daemons Requires: %{name} = %{nginx_version} @@ -166,7 +166,7 @@ Module for Brotli compression. Summary: High performance, low rules maintenance WAF Version: %{naxsi_ver} -Release: 12%{?dist} +Release: 13%{?dist} Group: System Environment/Daemons Requires: %{name} = %{nginx_version} From 6279136328d06c35267e1458a93cd8fe0054886d Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 31 Mar 2023 01:07:38 +0300 Subject: [PATCH 4/7] Improve bibop recipe --- .bibop/webkaos.recipe | 3 --- 1 file changed, 3 deletions(-) diff --git a/.bibop/webkaos.recipe b/.bibop/webkaos.recipe index 70706a8..cfac6d0 100644 --- a/.bibop/webkaos.recipe +++ b/.bibop/webkaos.recipe @@ -237,9 +237,6 @@ command "service {service_name} check" "Broken config check" command "service {service_name} reload" "Broken config reload" !exit 0 -command "service {service_name} restart" "Restart with broken config" - !exit 0 - command "-" "Restore working configuration" copy webkaos.conf {config} From eb26d2f7d2cd400c3a32e8e0d2871abbf280a9c6 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 31 Mar 2023 01:34:11 +0300 Subject: [PATCH 5/7] Improve CI workflow --- .github/workflows/ci.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85164ba..69e279c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,11 +85,22 @@ jobs: ./entrypoint_test.sh popd + DockerVersionCheck: + name: Docker versions check + runs-on: ubuntu-latest + + steps: + - name: Checkout source code + uses: actions/checkout@v3 + + - name: Run entrypoint unit tests + run: .docker/version_check.sh + DockerBuild: name: Docker Build Check runs-on: ubuntu-latest - needs: [Hadolint, Shellcheck, DockerEntrypointUnit] + needs: [Hadolint, Shellcheck, DockerEntrypointUnit, DockerVersionCheck] env: REGISTRY: ghcr.io From 37f30554ba63a71d8f29af16d3b87e4bf9772c8d Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 31 Mar 2023 01:36:51 +0300 Subject: [PATCH 6/7] Improve CI workflow --- .docker/version_check.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.docker/version_check.sh b/.docker/version_check.sh index 8ba1c23..9ba63a5 100755 --- a/.docker/version_check.sh +++ b/.docker/version_check.sh @@ -63,12 +63,12 @@ checkDockerfiles() { fi done - if [[ -z "$has_errors" ]] ; then - show "\nEverything looks fine, excellent!" $BOLD - else + if [[ -n "$has_errors" ]] ; then show "\nFound problems with versions!" $RED + return 1 fi + show "\nEverything looks fine, excellent!" $BOLD return 0 } From f0ddb4e98ab9283c2a4dd3aa89c20635d6ce07cd Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 31 Mar 2023 01:39:57 +0300 Subject: [PATCH 7/7] Bump version in dockerfiles --- .docker/centos7-unprivileged.docker | 2 +- .docker/centos7.docker | 2 +- .docker/ol7-unprivileged.docker | 2 +- .docker/ol7.docker | 2 +- .docker/ol8-unprivileged.docker | 2 +- .docker/ol8.docker | 2 +- .docker/ol9-unprivileged.docker | 2 +- .docker/ol9.docker | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.docker/centos7-unprivileged.docker b/.docker/centos7-unprivileged.docker index 0159011..7498f8a 100644 --- a/.docker/centos7-unprivileged.docker +++ b/.docker/centos7-unprivileged.docker @@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \ org.opencontainers.image.url="https://kaos.sh/webkaos" \ org.opencontainers.image.source="https://github.com/essentialkaos/webkaos" -ARG WEBKAOS_VER=1.23.3 +ARG WEBKAOS_VER=1.23.4 ARG BROTLI_VER=0.1.5 ARG REPOSITORY=kaos-release diff --git a/.docker/centos7.docker b/.docker/centos7.docker index e1baf0a..8655620 100644 --- a/.docker/centos7.docker +++ b/.docker/centos7.docker @@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="WEBKAOS" \ org.opencontainers.image.url="https://kaos.sh/webkaos" \ org.opencontainers.image.source="https://github.com/essentialkaos/webkaos" -ARG WEBKAOS_VER=1.23.3 +ARG WEBKAOS_VER=1.23.4 ARG BROTLI_VER=0.1.5 ARG REPOSITORY=kaos-release diff --git a/.docker/ol7-unprivileged.docker b/.docker/ol7-unprivileged.docker index e44c457..6eacd2b 100644 --- a/.docker/ol7-unprivileged.docker +++ b/.docker/ol7-unprivileged.docker @@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \ org.opencontainers.image.url="https://kaos.sh/webkaos" \ org.opencontainers.image.source="https://github.com/essentialkaos/webkaos" -ARG WEBKAOS_VER=1.23.3 +ARG WEBKAOS_VER=1.23.4 ARG BROTLI_VER=0.1.5 ARG REPOSITORY=kaos-release diff --git a/.docker/ol7.docker b/.docker/ol7.docker index 3eb83c4..4f2eb10 100644 --- a/.docker/ol7.docker +++ b/.docker/ol7.docker @@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="WEBKAOS" \ org.opencontainers.image.url="https://kaos.sh/webkaos" \ org.opencontainers.image.source="https://github.com/essentialkaos/webkaos" -ARG WEBKAOS_VER=1.23.3 +ARG WEBKAOS_VER=1.23.4 ARG BROTLI_VER=0.1.5 ARG REPOSITORY=kaos-release diff --git a/.docker/ol8-unprivileged.docker b/.docker/ol8-unprivileged.docker index e23a483..c9ffe4f 100644 --- a/.docker/ol8-unprivileged.docker +++ b/.docker/ol8-unprivileged.docker @@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \ org.opencontainers.image.url="https://kaos.sh/webkaos" \ org.opencontainers.image.source="https://github.com/essentialkaos/webkaos" -ARG WEBKAOS_VER=1.23.3 +ARG WEBKAOS_VER=1.23.4 ARG BROTLI_VER=0.1.5 ARG REPOSITORY=kaos-release diff --git a/.docker/ol8.docker b/.docker/ol8.docker index b09dfa3..c0221a8 100644 --- a/.docker/ol8.docker +++ b/.docker/ol8.docker @@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="WEBKAOS" \ org.opencontainers.image.url="https://kaos.sh/webkaos" \ org.opencontainers.image.source="https://github.com/essentialkaos/webkaos" -ARG WEBKAOS_VER=1.23.3 +ARG WEBKAOS_VER=1.23.4 ARG BROTLI_VER=0.1.5 ARG REPOSITORY=kaos-release diff --git a/.docker/ol9-unprivileged.docker b/.docker/ol9-unprivileged.docker index 64cf651..7d30d1d 100644 --- a/.docker/ol9-unprivileged.docker +++ b/.docker/ol9-unprivileged.docker @@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \ org.opencontainers.image.url="https://kaos.sh/webkaos" \ org.opencontainers.image.source="https://github.com/essentialkaos/webkaos" -ARG WEBKAOS_VER=1.23.3 +ARG WEBKAOS_VER=1.23.4 ARG BROTLI_VER=0.1.5 ARG REPOSITORY=kaos-release diff --git a/.docker/ol9.docker b/.docker/ol9.docker index 75c801e..3b45cf8 100644 --- a/.docker/ol9.docker +++ b/.docker/ol9.docker @@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="WEBKAOS" \ org.opencontainers.image.url="https://kaos.sh/webkaos" \ org.opencontainers.image.source="https://github.com/essentialkaos/webkaos" -ARG WEBKAOS_VER=1.23.3 +ARG WEBKAOS_VER=1.23.4 ARG BROTLI_VER=0.1.5 ARG REPOSITORY=kaos-release