diff --git a/cosign-image/Dockerfile b/cosign-image/Dockerfile index fd37a2cdf..27d8af4d1 100644 --- a/cosign-image/Dockerfile +++ b/cosign-image/Dockerfile @@ -17,9 +17,9 @@ #!BuildTag: suse/cosign:%%cosign_version%%-%RELEASE% #!BuildTag: suse/cosign:%%cosign_version%% -#!BuildTag: suse/cosign:2.2 -#!BuildName: suse-cosign-2.2 -#!BuildVersion: 15.7.2.2 +#!BuildTag: suse/cosign:2.4 +#!BuildName: suse-cosign-2.4 +#!BuildVersion: 15.7.2.4 FROM bci/bci-micro:15.7 AS target FROM suse/sle15:15.7 AS builder COPY --from=target / /target 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 diff --git a/cosign-image/cosign-image.changes b/cosign-image/cosign-image.changes index df4ec78f6..7c4ee8918 100644 --- a/cosign-image/cosign-image.changes +++ b/cosign-image/cosign-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 12 15:11:49 UTC 2024 - SUSE Update Bot + +- new cosign version + ------------------------------------------------------------------- Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot 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#--} ;; diff --git a/rmt-mariadb-image/rmt-mariadb-image.changes b/rmt-mariadb-image/rmt-mariadb-image.changes index bfdca76df..5b0800e5a 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:32:53 UTC 2024 - SUSE Update Bot + +- update entrypoint from upstream + ------------------------------------------------------------------- Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot