diff --git a/Dockerfile b/Dockerfile index cf4f1f0..82b66c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,8 @@ #!BuildTag: opensuse/valkey:%%valkey_version%%-%RELEASE% #!BuildTag: opensuse/valkey:%%valkey_version%% +#!BuildTag: opensuse/valkey:8.0 +#!BuildTag: opensuse/valkey:8 #!BuildTag: opensuse/valkey:latest FROM opensuse/bci/bci-micro:latest AS target @@ -24,9 +26,13 @@ FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends valkey valkey-compat-redis; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends valkey; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +# sanity check that the version from the tag is equal to the version of valkey that we expect +RUN set -euo pipefail; \ + [ "$(rpm --root /target -q --qf '%{version}' valkey | \ + cut -d '.' -f -2)" = "8.0" ] FROM opensuse/bci/bci-micro:latest COPY --from=builder /target / # Define labels according to https://en.opensuse.org/Building_derived_containers diff --git a/README.md b/README.md index c22c590..c2902b5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# The Valkey %%valkey_version%% container image +# The Valkey 8.0 container image ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green) @@ -18,13 +18,13 @@ To start an instance, follow these instructions: ```ShellSession -podman run --rm registry.opensuse.org/opensuse/valkey:%%valkey_version%% +podman run --rm registry.opensuse.org/opensuse/valkey:8.0 ``` In case you want start with persistent storage, run this: ```ShellSession -podman run --rm registry.opensuse.org/opensuse/valkey:%%valkey_version%% valkey-server --save 60 1 +podman run --rm registry.opensuse.org/opensuse/valkey:8.0 valkey-server --save 60 1 ``` This one will save a snapshot of the DB every 60 seconds if at least 1 diff --git a/valkey-image.changes b/valkey-image.changes index d89d0a6..757e39f 100644 --- a/valkey-image.changes +++ b/valkey-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 25 15:06:00 UTC 2024 - SUSE Update Bot + +- Add major & major + minor version tag, do not install redis compat package + ------------------------------------------------------------------- Fri Nov 15 11:29:13 UTC 2024 - SUSE Update Bot