Skip to content

Commit

Permalink
Add redis-server versions 5.0.11 & 6.0.11 and 6.2.0. Update latest to…
Browse files Browse the repository at this point in the history
… 6.2.0
  • Loading branch information
Grokzen committed Feb 27, 2021
1 parent dafc4c7 commit 31a6e22
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 8 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# This travis run should only test and build the latest version of all major redis-server versions
language: python
python:
- "3.5"
Expand All @@ -7,7 +8,8 @@ env:
- REDIS_VERSION=3.0.7
- REDIS_VERSION=3.2.13
- REDIS_VERSION=4.0.14
- REDIS_VERSION=5.0.10
- REDIS_VERSION=6.0.10
- REDIS_VERSION=5.0.11
- REDIS_VERSION=6.0.11
- REDIS_VERSION=6.2.0
script:
docker build --build-arg redis_version=$REDIS_VERSION -t grokzen/redis-cluster .
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ 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=6.0
ARG redis_version=6.2

RUN wget -qO redis.tar.gz https://github.com/redis/redis/tarball/${redis_version} \
&& tar xfz redis.tar.gz -C / \
Expand Down
11 changes: 10 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ build-5.0:
@docker build --build-arg redis_version=5.0.8 -t grokzen/redis-cluster:5.0.8 . &
@docker build --build-arg redis_version=5.0.9 -t grokzen/redis-cluster:5.0.9 . &
@docker build --build-arg redis_version=5.0.10 -t grokzen/redis-cluster:5.0.10 . &
@docker build --build-arg redis_version=5.0.11 -t grokzen/redis-cluster:5.0.11 . &
echo "All 5.0.x builds started as background jobs... Will now wait for them to complete building"
wait
echo "All 5.0.x builds now completed"
Expand All @@ -136,19 +137,21 @@ build-6.0:
@docker build --build-arg redis_version=6.0.8 -t grokzen/redis-cluster:6.0.8 . &
@docker build --build-arg redis_version=6.0.9 -t grokzen/redis-cluster:6.0.9 . &
@docker build --build-arg redis_version=6.0.10 -t grokzen/redis-cluster:6.0.10 . &
@docker build --build-arg redis_version=6.0.11 -t grokzen/redis-cluster:6.0.11 . &
echo "All 6.0.x builds started as background jobs... Will now wait for them to complete building"
wait
echo "All 6.0.x builds now completed"

build-6.2:
@docker build --build-arg redis_version=6.2-rc1 -t grokzen/redis-cluster:6.2-rc1 . &
@docker build --build-arg redis_version=6.2-rc2 -t grokzen/redis-cluster:6.2-rc2 . &
@docker build --build-arg redis_version=6.2.0 -t grokzen/redis-cluster:6.2.0 . &
echo "All 6.2.x builds started as background jobs... Will now wait for them to complete building"
wait
echo "All 6.2.x builds now completed"

build-latest:
docker build --build-arg redis_version=6.0.10 -t grokzen/redis-cluster:latest .
docker build --build-arg redis_version=6.2.0 -t grokzen/redis-cluster:latest .

build-all: build-3.0 build-3.2 build-4.0 build-5.0 build-6.0 build-6.2 build-latest

Expand Down Expand Up @@ -216,6 +219,7 @@ push-releases-5.0:
@docker push grokzen/redis-cluster:5.0.8 &
@docker push grokzen/redis-cluster:5.0.9 &
@docker push grokzen/redis-cluster:5.0.10 &
@docker push grokzen/redis-cluster:5.0.11 &
echo "Pushing all 5.0.x releases to docker-hub... waiting for task to finish"
wait
echo "Upload completed..."
Expand All @@ -232,13 +236,15 @@ push-releases-6.0:
@docker push grokzen/redis-cluster:6.0.8 &
@docker push grokzen/redis-cluster:6.0.9 &
@docker push grokzen/redis-cluster:6.0.10 &
@docker push grokzen/redis-cluster:6.0.11 &
echo "Pushing all 6.0.x releases to docker-hub... waiting for task to finish"
wait
echo "Upload completed..."

push-releases-6.2:
@docker push grokzen/redis-cluster:6.2-rc1 &
@docker push grokzen/redis-cluster:6.2-rc2 &
@docker push grokzen/redis-cluster:6.2.0 &
echo "Pushing all 6.2.x releases to docker-hub... waiting for task to finish"
wait
echo "Upload completed..."
Expand Down Expand Up @@ -308,6 +314,7 @@ pull-releases-5.0:
@docker pull grokzen/redis-cluster:5.0.8 &
@docker pull grokzen/redis-cluster:5.0.9 &
@docker pull grokzen/redis-cluster:5.0.10 &
@docker pull grokzen/redis-cluster:5.0.11 &

pull-releases-6.0:
@docker pull grokzen/redis-cluster:6.0.0 &
Expand All @@ -321,10 +328,12 @@ pull-releases-6.0:
@docker pull grokzen/redis-cluster:6.0.8 &
@docker pull grokzen/redis-cluster:6.0.9 &
@docker pull grokzen/redis-cluster:6.0.10 &
@docker pull grokzen/redis-cluster:6.0.11 &

pull-releases-6.2:
@docker pull grokzen/redis-cluster:6.2-rc1 &
@docker pull grokzen/redis-cluster:6.2-rc2 &
@docker pull grokzen/redis-cluster:6.2.0 &

pull-latest:
@docker pull grokzen/redis-cluster:latest
Expand Down
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,15 +185,15 @@ For a release to be buildable it needs to be present at this url: https://downloa
To build a different redis version use the argument `--build-arg` argument.

# Example plain docker
docker build --build-arg redis_version=4.0.13 -t grokzen/redis-cluster .
docker build --build-arg redis_version=6.0.11 -t grokzen/redis-cluster .


### docker-compose

To build a different redis version use the `--build-arg` argument.

# Example docker-compose
docker-compose build --build-arg "redis_version=4.0.13" redis-cluster
docker-compose build --build-arg "redis_version=6.0.11" redis-cluster



Expand All @@ -203,15 +203,17 @@ 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 == 6.0.10
- latest == 6.2.0

Redis 6.2.x versions:

- 6.2.0
- 6.2-rc2
- 6.2-rc1

Redis 6.0.x versions:

- 6.0.11
- 6.0.10
- 6.0.9
- 6.0.8
Expand All @@ -226,6 +228,7 @@ Redis 6.0.x versions:

Redis 5.0.x version:

- 5.0.11
- 5.0.10
- 5.0.9
- 5.0.8
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: '6.0.10'
redis_version: '6.0.11'
hostname: server
ports:
- '7000-7050:7000-7050'
Expand Down

0 comments on commit 31a6e22

Please sign in to comment.