Skip to content

Commit

Permalink
Version updates. New base image hash
Browse files Browse the repository at this point in the history
  • Loading branch information
Grokzen committed Jun 25, 2024
1 parent 921d7f1 commit 7922e1f
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 14 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ env:
# - REDIS_VERSION=3.2.13
# - REDIS_VERSION=4.0.14
# - REDIS_VERSION=5.0.12
- REDIS_VERSION=6.0.18
- REDIS_VERSION=6.2.11
- REDIS_VERSION=7.0.10
# - REDIS_VERSION=6.0.20
- REDIS_VERSION=6.2.14
- REDIS_VERSION=7.0.15
- REDIS_VERSION=7.2.5
- REDIS_VERSION=7.4-rc1
script:
docker build --build-arg redis_version=$REDIS_VERSION -t grokzen/redis-cluster .
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 2024-06-25

* Added 7.2.x releases and published docker images
* added 7.4-rc1 release and published
* Updated all older generations of images
* New base image that contains more updated patches etc

## 2022-12-18

* Added redis 7.0.x releases and published docker images
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build based on redis:6.0 from 2020-05-05
FROM redis@sha256:f7ee67d8d9050357a6ea362e2a7e8b65a6823d9b612bc430d057416788ef6df9
# Build based on redis:7.2.5 from "2024-05-22T23:17:59Z"
FROM redis@sha256:e422889e156ebea83856b6ff973bfe0c86bce867d80def228044eeecf925592b

LABEL maintainer="Johan Andersson <Grokzen@gmail.com>"

Expand All @@ -23,8 +23,8 @@ ENV SSL_CERT_FILE=/usr/local/etc/openssl/cert.pem

RUN gem install redis -v 4.1.3

# This will always build the latest release/commit in the 6.0 branch
ARG redis_version=7.0
# This will always build the latest release/commit in the 7.2 branch
ARG redis_version=7.2

RUN wget -qO redis.tar.gz https://github.com/redis/redis/tarball/${redis_version} \
&& tar xfz redis.tar.gz -C / \
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT LICENSE

Copyright 2014-2021 Johan Andersson
Copyright 2014-2024 Johan Andersson

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
25 changes: 24 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,28 @@ The following tags with pre-built images is available on `docker-hub`.

Latest release in the most recent stable branch will be used as `latest` version.

- latest == 7.0.10
- latest == 7.2.5

Redis 7.4-rc1 version:

- 7.4-rc1

Redis 7.2.x version:

- 7.2.5
- 7.2.4
- 7.2.3
- 7.2.2
- 7.2.1
- 7.2.0

Redis 7.0.x version:

- 7.0.15
- 7.0.14
- 7.0.13
- 7.0.12
- 7.0.11
- 7.0.10
- 7.0.9
- 7.0.8
Expand All @@ -247,6 +265,9 @@ Redis 7.0.x version:

Redis 6.2.x versions:

- 6.2.14
- 6.2.13
- 6.2.12
- 6.2.11
- 6.2.10
- 6.2.9
Expand All @@ -262,6 +283,8 @@ Redis 6.2.x versions:

Redis 6.0.x versions:

- 6.0.20
- 6.0.19
- 6.0.18
- 6.0.17
- 6.0.16
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
build:
context: .
args:
redis_version: '7.0.10'
redis_version: '7.2.5'
hostname: server
ports:
- '7000-7050:7000-7050'
Expand Down
10 changes: 6 additions & 4 deletions tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,21 @@
from invoke import task


latest_version_string = "7.0.10"
latest_version_string = "7.2.5"

# Unpublished versions
version_config_mapping = []
version_config_mapping += [f"3.0.{i}" for i in range(0, 8)]
version_config_mapping += [f"3.2.{i}" for i in range(0, 14)]
version_config_mapping += [f"4.0.{i}" for i in range(0, 15)]
version_config_mapping += [f"5.0.{i}" for i in range(0, 13)]
version_config_mapping += [f"6.0.{i}" for i in range(0, 21)]

# Published versions
version_config_mapping += [f"6.0.{i}" for i in range(0, 19)]
version_config_mapping += [f"6.2.{i}" for i in range(0, 12)]
version_config_mapping += [f"7.0.{i}" for i in range(0, 11)]
version_config_mapping += [f"6.2.{i}" for i in range(0, 15)]
version_config_mapping += [f"7.0.{i}" for i in range(0, 16)]
version_config_mapping += [f"7.2.{i}" for i in range(0, 6)]
version_config_mapping += ["7.4-rc1"]


def version_name_to_version(version):
Expand Down

0 comments on commit 7922e1f

Please sign in to comment.