From 5d27e362c136fcd917a84ccef0b88d1fb2f0e28d Mon Sep 17 00:00:00 2001 From: "a.shibata" Date: Fri, 12 Mar 2021 23:42:10 +0900 Subject: [PATCH 1/4] docs: upgrade redis to redis:5.0.9 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 52381bfc..9c25e311 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ Step 2. Launch a redis container ```bash docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/var/lib/redis \ - sameersbn/redis:4.0.9-2 + redis:5.0.9 ``` Step 3. Launch the gitlab container @@ -359,7 +359,7 @@ To illustrate linking with a redis container, we will use the [sameersbn/redis]( First, lets pull the redis image from the docker index. ```bash -docker pull sameersbn/redis:4.0.9-2 +docker pull redis:5.0.9 ``` Lets start the redis container @@ -367,7 +367,7 @@ Lets start the redis container ```bash docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/var/lib/redis \ - sameersbn/redis:4.0.9-2 + redis:5.0.9 ``` We are now ready to start the GitLab application. From 19f8c4927ef8ae9a01d107fb80f173a91dd9301d Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 23 Jun 2021 11:11:37 +0530 Subject: [PATCH 2/4] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9c25e311..dd1d3b2c 100644 --- a/README.md +++ b/README.md @@ -179,8 +179,8 @@ Step 2. Launch a redis container ```bash docker run --name gitlab-redis -d \ - --volume /srv/docker/gitlab/redis:/var/lib/redis \ - redis:5.0.9 + --volume /srv/docker/gitlab/redis:/data \ + redis:6.2 ``` Step 3. Launch the gitlab container @@ -354,20 +354,20 @@ docker run --name gitlab -it --rm \ You can link this image with a redis container to satisfy gitlab's redis requirement. The alias of the redis server container should be set to **redisio** while linking with the gitlab image. -To illustrate linking with a redis container, we will use the [sameersbn/redis](https://github.com/sameersbn/docker-redis) image. Please refer the [README](https://github.com/sameersbn/docker-redis/blob/master/README.md) of docker-redis for details. +To illustrate linking with a redis container, we will use the [redis](https://github.com/docker-library/redis) image. Please refer the [README](https://github.com/docker-library/docs/blob/master/redis/README.md) for details. First, lets pull the redis image from the docker index. ```bash -docker pull redis:5.0.9 +docker pull redis:6.2 ``` Lets start the redis container ```bash docker run --name gitlab-redis -d \ - --volume /srv/docker/gitlab/redis:/var/lib/redis \ - redis:5.0.9 + --volume /srv/docker/gitlab/redis:/data \ + redis:6.2 ``` We are now ready to start the GitLab application. From 0ba02c4881d4c46aba95c56c4ab70c2016a08289 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 23 Jun 2021 11:13:01 +0530 Subject: [PATCH 3/4] Update docker-compose.yml --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4d964578..00535faa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,11 +3,11 @@ version: '2.3' services: redis: restart: always - image: redis:5.0.9 + image: redis:6.2 command: - --loglevel warning volumes: - - redis-data:/var/lib/redis:Z + - redis-data:/data:Z postgresql: restart: always From 8ce166bfd1a56842052cccb58a77253ad71d8451 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 23 Jun 2021 11:14:29 +0530 Subject: [PATCH 4/4] Update s3_compatible_storage.md --- docs/s3_compatible_storage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index 1a491410..b6e9f3db 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -72,11 +72,11 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:4.0.9-2 + image: sameersbn/redis:6.2 command: - --loglevel warning volumes: - - /tmp/docker/gitlab/redis:/var/lib/redis:Z + - /tmp/docker/gitlab/redis:/data:Z postgresql: restart: always