From 416d49863c68f11777fffe018d7581af75b11b77 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 17 Jul 2018 08:33:39 +0530 Subject: [PATCH 1/3] pin redis image to series 3.x --- README.md | 6 +++--- docker-compose.yml | 2 +- docs/docker-compose-registry.yml | 2 +- docs/s3_compatible_storage.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7a837601..326ceac4 100644 --- a/README.md +++ b/README.md @@ -181,7 +181,7 @@ Step 2. Launch a redis container ```bash docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/var/lib/redis \ - sameersbn/redis:latest + sameersbn/redis:3.0.6 ``` Step 3. Launch the gitlab container @@ -443,7 +443,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:latest +docker pull sameersbn/redis:3.0.6 ``` Lets start the redis container @@ -451,7 +451,7 @@ Lets start the redis container ```bash docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/var/lib/redis \ - sameersbn/redis:latest + sameersbn/redis:3.0.6 ``` We are now ready to start the GitLab application. diff --git a/docker-compose.yml b/docker-compose.yml index d180dfef..3dc3836e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:latest + image: sameersbn/redis:3.0.6 command: - --loglevel warning volumes: diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ba87eea6..676dc10e 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:latest + image: sameersbn/redis:3.0.6 command: - --loglevel warning volumes: diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index 3d627927..4acf714c 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -72,7 +72,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:latest + image: sameersbn/redis:3.0.6 command: - --loglevel warning volumes: From 7fe507a0f399ad2242dea15aebaf01052d17fc5b Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 17 Jul 2018 08:34:23 +0530 Subject: [PATCH 2/3] ping mysql release to 5.7 series --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 326ceac4..5093926f 100644 --- a/README.md +++ b/README.md @@ -330,7 +330,7 @@ Assuming that your mysql data is available at `/srv/docker/gitlab/mysql` ```bash docker run --name gitlab-mysql -d \ --volume /srv/docker/gitlab/mysql:/var/lib/mysql \ - sameersbn/mysql:latest + sameersbn/mysql:5.7.22-1 ``` This will start a mysql container with your existing mysql data. Now login to the mysql container and create a user for the existing `gitlabhq_production` database. @@ -375,7 +375,7 @@ To illustrate linking with a mysql container, we will use the [sameersbn/mysql]( First, lets pull the mysql image from the docker index. ```bash -docker pull sameersbn/mysql:latest +docker pull sameersbn/mysql:5.7.22-1 ``` For data persistence lets create a store for the mysql and start the container. @@ -394,7 +394,7 @@ docker run --name gitlab-mysql -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/mysql:/var/lib/mysql \ - sameersbn/mysql:latest + sameersbn/mysql:5.7.22-1 ``` The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with full/remote access to the `gitlabhq_production` database. From a28268c1194147ea3b7e232c644937d2a0eef9a0 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 17 Jul 2018 08:34:41 +0530 Subject: [PATCH 3/3] bump to postgresql 10 --- README.md | 6 +++--- docker-compose.yml | 2 +- docs/s3_compatible_storage.md | 2 +- kubernetes/postgresql-rc.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5093926f..94dd7f03 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ docker run --name gitlab-postgresql -d \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --env 'DB_EXTENSION=pg_trgm' \ --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \ - sameersbn/postgresql:9.6-2 + sameersbn/postgresql:10 ``` Step 2. Launch a redis container @@ -277,7 +277,7 @@ To illustrate linking with a postgresql container, we will use the [sameersbn/po First, lets pull the postgresql image from the docker index. ```bash -docker pull sameersbn/postgresql:9.6-2 +docker pull sameersbn/postgresql:10 ``` For data persistence lets create a store for the postgresql and start the container. @@ -297,7 +297,7 @@ docker run --name gitlab-postgresql -d \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --env 'DB_EXTENSION=pg_trgm' \ --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \ - sameersbn/postgresql:9.6-2 + sameersbn/postgresql:10 ``` The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with access to the `gitlabhq_production` database. diff --git a/docker-compose.yml b/docker-compose.yml index 3dc3836e..67c4993a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:9.6-2 + image: sameersbn/postgresql:10 volumes: - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z environment: diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index 4acf714c..665b28a7 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -80,7 +80,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:9.6-2 + image: sameersbn/postgresql:10 volumes: - /tmp/docker/gitlab/postgresql:/var/lib/postgresql:Z environment: diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml index 8e5db281..d5ce45aa 100644 --- a/kubernetes/postgresql-rc.yml +++ b/kubernetes/postgresql-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: postgresql - image: sameersbn/postgresql:9.6-2 + image: sameersbn/postgresql:10 env: - name: DB_USER value: gitlab