Skip to content

Commit a40c1b9

Browse files
committed
Merge branch 'topic/update-readme' of github.com:beli68/docker-gitlab into beli68-topic/update-readme
2 parents 09b8c1c + 8ce166b commit a40c1b9

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ Step 2. Launch a redis container
179179

180180
```bash
181181
docker run --name gitlab-redis -d \
182-
--volume /srv/docker/gitlab/redis:/var/lib/redis \
183-
sameersbn/redis:4.0.9-2
182+
--volume /srv/docker/gitlab/redis:/data \
183+
redis:6.2
184184
```
185185

186186
Step 3. Launch the gitlab container
@@ -354,20 +354,20 @@ docker run --name gitlab -it --rm \
354354

355355
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.
356356

357-
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.
357+
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.
358358

359359
First, lets pull the redis image from the docker index.
360360

361361
```bash
362-
docker pull sameersbn/redis:4.0.9-2
362+
docker pull redis:6.2
363363
```
364364

365365
Lets start the redis container
366366

367367
```bash
368368
docker run --name gitlab-redis -d \
369-
--volume /srv/docker/gitlab/redis:/var/lib/redis \
370-
sameersbn/redis:4.0.9-2
369+
--volume /srv/docker/gitlab/redis:/data \
370+
redis:6.2
371371
```
372372

373373
We are now ready to start the GitLab application.

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ version: '2.3'
33
services:
44
redis:
55
restart: always
6-
image: redis:5.0.9
6+
image: redis:6.2
77
command:
88
- --loglevel warning
99
volumes:
10-
- redis-data:/var/lib/redis:Z
10+
- redis-data:/data:Z
1111

1212
postgresql:
1313
restart: always

docs/s3_compatible_storage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ version: '2'
7272
services:
7373
redis:
7474
restart: always
75-
image: sameersbn/redis:4.0.9-2
75+
image: sameersbn/redis:6.2
7676
command:
7777
- --loglevel warning
7878
volumes:
79-
- /tmp/docker/gitlab/redis:/var/lib/redis:Z
79+
- /tmp/docker/gitlab/redis:/data:Z
8080

8181
postgresql:
8282
restart: always

0 commit comments

Comments
 (0)