From e0446a3efc93d154b5442b14a540ceb80e291c9f Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Tue, 12 Nov 2024 14:28:59 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=A4=96:=20Update=20build=20recipes=20?= =?UTF-8?q?from=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cosign-image/Dockerfile | 6 +++--- cosign-image/README.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cosign-image/Dockerfile b/cosign-image/Dockerfile index 3fd9e6753..70c55c4ea 100644 --- a/cosign-image/Dockerfile +++ b/cosign-image/Dockerfile @@ -17,10 +17,10 @@ #!BuildTag: suse/cosign:%%cosign_version%%-%RELEASE% #!BuildTag: suse/cosign:%%cosign_version%% -#!BuildTag: suse/cosign:2.2 +#!BuildTag: suse/cosign:2.4 #!BuildTag: suse/cosign:latest -#!BuildName: suse-cosign-2.2 -#!BuildVersion: 15.6.2.2 +#!BuildName: suse-cosign-2.4 +#!BuildVersion: 15.6.2.4 #!BuildRelease: 0 FROM registry.suse.com/bci/bci-micro:15.6 AS target FROM suse/sle15:15.6 AS builder diff --git a/cosign-image/README.md b/cosign-image/README.md index b8e9283dc..090fa5f7d 100644 --- a/cosign-image/README.md +++ b/cosign-image/README.md @@ -23,7 +23,7 @@ and a certificate issuer using the `--certificate-identity` and `--certificate-oidc-issuer` flags: ```shell -$ podman run registry.suse.com/suse/cosign:2.2 \ +$ podman run registry.suse.com/suse/cosign:2.4 \ verify $IMAGE \ --certificate-identity=$IDENTITY \ --certificate-oidc-issuer=$OIDC_ISSUER @@ -43,7 +43,7 @@ Valid payload is printed to stdout, in JSON format. Note that the signed payload includes the digest of the container image, which indicated that these "detached" signatures apply to the correct image. ```shell -$ podman run registry.suse.com/suse/cosign:2.2 verify --key cosign.pub $IMAGE_URI:1h +$ podman run registry.suse.com/suse/cosign:2.4 verify --key cosign.pub $IMAGE_URI:1h The following checks were performed on these signatures: - The cosign claims were validated - The signatures were verified against the specified public key From 5c0a1f6067a2cec43c4af664c6ce25e521628a1a Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Tue, 12 Nov 2024 15:12:21 +0000 Subject: [PATCH 2/4] Update changelog for cosign-image --- cosign-image/cosign-image.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cosign-image/cosign-image.changes b/cosign-image/cosign-image.changes index 8422710da..7f1d57c5d 100644 --- a/cosign-image/cosign-image.changes +++ b/cosign-image/cosign-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 12 15:12:21 UTC 2024 - SUSE Update Bot + +- new cosign version + ------------------------------------------------------------------- Wed Oct 30 15:35:19 UTC 2024 - SUSE Update Bot From dd9e2304e5b096ae8c652eb4cf2be098fb633518 Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Tue, 12 Nov 2024 15:22:22 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=A4=96:=20Update=20build=20recipes=20?= =?UTF-8?q?from=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rmt-mariadb-image/docker-entrypoint.sh | 10 +++------- rmt-mariadb-image/healthcheck.sh | 5 +++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rmt-mariadb-image/docker-entrypoint.sh b/rmt-mariadb-image/docker-entrypoint.sh index 792c34534..3cca9d6f4 100644 --- a/rmt-mariadb-image/docker-entrypoint.sh +++ b/rmt-mariadb-image/docker-entrypoint.sh @@ -121,6 +121,7 @@ mysql_get_config() { docker_temp_server_start() { "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \ --expire-logs-days=0 \ + --skip-slave-start \ --loose-innodb_buffer_pool_load_at_startup=0 \ & declare -g MARIADB_PID @@ -458,7 +459,6 @@ docker_setup_db() { # To create replica user local createReplicaUser= local changeMasterTo= - local startReplica= if [ -n "$MARIADB_REPLICATION_USER" ] ; then if [ -z "$MARIADB_MASTER_HOST" ]; then # on master @@ -471,7 +471,6 @@ docker_setup_db() { # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # shellcheck disable=SC2153 changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;" - startReplica="START REPLICA;" fi fi @@ -502,7 +501,6 @@ docker_setup_db() { ${userGrants} ${changeMasterTo} - ${startReplica} EOSQL } @@ -598,8 +596,7 @@ docker_mariadb_upgrade() { fi mysql_note "Starting temporary server" docker_temp_server_start "$@" --skip-grant-tables \ - --loose-innodb_buffer_pool_dump_at_shutdown=0 \ - --skip-slave-start + --loose-innodb_buffer_pool_dump_at_shutdown=0 mysql_note "Temporary server started." docker_mariadb_backup_system @@ -624,8 +621,7 @@ EOSQL # need a restart as FLUSH PRIVILEGES isn't reversable mysql_note "Restarting temporary server for upgrade" docker_temp_server_start "$@" --skip-grant-tables \ - --loose-innodb_buffer_pool_dump_at_shutdown=0 \ - --skip-slave-start + --loose-innodb_buffer_pool_dump_at_shutdown=0 else return 0 fi diff --git a/rmt-mariadb-image/healthcheck.sh b/rmt-mariadb-image/healthcheck.sh index c0fb93bba..07b4fe357 100644 --- a/rmt-mariadb-image/healthcheck.sh +++ b/rmt-mariadb-image/healthcheck.sh @@ -361,6 +361,11 @@ while [ $# -gt 0 ]; do fi nodefaults= ;; + --no-connect) + # used for /docker-entrypoint-initdb.d scripts + # where you definately don't want a connection test + connect_s=0 + ;; --*) test=${1#--} ;; From a48cf9eb69122a73f091fadb96487abc642b2fda Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Tue, 12 Nov 2024 15:33:29 +0000 Subject: [PATCH 4/4] Update changelog for rmt-mariadb-image --- rmt-mariadb-image/rmt-mariadb-image.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rmt-mariadb-image/rmt-mariadb-image.changes b/rmt-mariadb-image/rmt-mariadb-image.changes index 265b059a8..cd0d044d2 100644 --- a/rmt-mariadb-image/rmt-mariadb-image.changes +++ b/rmt-mariadb-image/rmt-mariadb-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 12 15:33:29 UTC 2024 - SUSE Update Bot + +- update entrypoint from upstream + ------------------------------------------------------------------- Thu Oct 31 16:12:08 UTC 2024 - SUSE Update Bot