mirror of
https://github.com/sameersbn/docker-gitlab.git
synced 2026-01-18 13:58:25 +00:00
release 8.0.4
This commit is contained in:
parent
4369b1df60
commit
fc47bcc93d
@ -57,17 +57,17 @@ docker run -it --rm [OPTIONS] \
|
||||
|
||||
Make a note of the backup archive `xxxxxxxxxx_gitlab_ci_backup.tar.gz` as it is the backup you will have to rollback to in case of errors.
|
||||
|
||||
> **Note**: From this point only `8.0.3` version images are used.
|
||||
> **Note**: From this point only `8.0.4` version images are used.
|
||||
|
||||
## Step 4 - Upgrade CI
|
||||
|
||||
CI `8.x.x` is only meant for the purpose of migrating to GitLab `8.0`. Here we need to upgrade to version `8.x.x` and generate a backup that will be imported into GitLab.
|
||||
|
||||
### Upgrade to `sameersbn/gitlab-ci:8.0.3`
|
||||
### Upgrade to `sameersbn/gitlab-ci:8.0.4`
|
||||
|
||||
```bash
|
||||
docker run -it --rm [OPTIONS] \
|
||||
sameersbn/gitlab-ci:8.0.3 app:init
|
||||
sameersbn/gitlab-ci:8.0.4 app:init
|
||||
```
|
||||
|
||||
### Create CI backup
|
||||
@ -76,7 +76,7 @@ docker run -it --rm [OPTIONS] \
|
||||
|
||||
```bash
|
||||
docker run -it --rm [OPTIONS] \
|
||||
sameersbn/gitlab-ci:8.0.3 app:rake backup:create
|
||||
sameersbn/gitlab-ci:8.0.4 app:rake backup:create
|
||||
```
|
||||
|
||||
Copy the generated backup archive `xxxxxxxxxx_gitlab_ci_backup.tar` into the `backups/` directory of the GitLab server.
|
||||
@ -89,16 +89,16 @@ We are done with CI. If the rest of the migration goes was planned you will not
|
||||
|
||||
## Step 5 - Upgrade GitLab
|
||||
|
||||
Before we can upgrade to `sameersbn/gitlab:8.0.3`, we need to assign the value of `GITLAB_CI_SECRETS_DB_KEY_BASE` (from CI) to `GITLAB_SECRETS_DB_KEY_BASE` in GitLab's environment.
|
||||
Before we can upgrade to `sameersbn/gitlab:8.0.4`, we need to assign the value of `GITLAB_CI_SECRETS_DB_KEY_BASE` (from CI) to `GITLAB_SECRETS_DB_KEY_BASE` in GitLab's environment.
|
||||
|
||||
Next you also need to set the environment variable `GITLAB_CI_HOST` to the address of your CI server, eg. `ci.example.com`. This will make sure that your existing runners will be able to communicate to GitLab with the old url.
|
||||
|
||||
### Upgrade to `sameersbn/gitlab:8.0.3`
|
||||
### Upgrade to `sameersbn/gitlab:8.0.4`
|
||||
|
||||
```bash
|
||||
docker run -it --rm [OPTIONS] \
|
||||
--env GITLAB_CI_HOST=ci.example.com --env GITLAB_SECRETS_DB_KEY_BASE=xxxxxx \
|
||||
sameersbn/gitlab:8.0.3 app:init
|
||||
sameersbn/gitlab:8.0.4 app:init
|
||||
```
|
||||
|
||||
### Migrate CI data
|
||||
@ -106,7 +106,7 @@ docker run -it --rm [OPTIONS] \
|
||||
```bash
|
||||
docker run -it --rm [OPTIONS] \
|
||||
--env GITLAB_CI_HOST=ci.example.com --env GITLAB_SECRETS_DB_KEY_BASE=xxxxxx \
|
||||
sameersbn/gitlab:8.0.3 app:rake ci:migrate
|
||||
sameersbn/gitlab:8.0.4 app:rake ci:migrate
|
||||
```
|
||||
|
||||
## Step 6 - Fix DNS and reverse proxy configurations
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
This file only reflects the changes that are made in the the docker image. Please refer to the upstream GitLab [CHANGELOG](https://github.com/gitlabhq/gitlabhq/blob/master/CHANGELOG) for the list of changes in GitLab.
|
||||
|
||||
**latest**
|
||||
**8.0.4**
|
||||
- gitlab: upgrade to CE v.8.0.4
|
||||
|
||||
**8.0.3**
|
||||
|
||||
50
README.md
50
README.md
@ -1,6 +1,6 @@
|
||||
[](https://dashboard.tutum.co/stack/deploy/)
|
||||
|
||||
# sameersbn/gitlab:8.0.3
|
||||
# sameersbn/gitlab:8.0.4
|
||||
|
||||
- [Introduction](#introduction)
|
||||
- [Version](#version)
|
||||
@ -65,7 +65,7 @@ Dockerfile to build a [GitLab](https://about.gitlab.com/) container image.
|
||||
|
||||
## Version
|
||||
|
||||
Current Version: `8.0.3`
|
||||
Current Version: `8.0.4`
|
||||
|
||||
# Contributing
|
||||
|
||||
@ -114,7 +114,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
|
||||
Pull the image from the docker index. This is the recommended method of installation as it is easier to update image. These builds are performed by the **Docker Trusted Build** service.
|
||||
|
||||
```bash
|
||||
docker pull sameersbn/gitlab:8.0.3
|
||||
docker pull sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
You can also pull the `latest` tag which is built from the repository *HEAD*
|
||||
@ -178,7 +178,7 @@ docker run --name gitlab -d \
|
||||
--env 'GITLAB_PORT=10080' --env 'GITLAB_SSH_PORT=10022' \
|
||||
--env 'GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alpha-numeric-string' \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
*Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
|
||||
@ -214,7 +214,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
|
||||
```bash
|
||||
docker run --name gitlab -d \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
## Database
|
||||
@ -245,7 +245,7 @@ docker run --name gitlab -d \
|
||||
--env 'DB_NAME=gitlabhq_production' \
|
||||
--env 'DB_USER=gitlab' --env 'DB_PASS=password' \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
#### Linking to PostgreSQL Container
|
||||
@ -288,7 +288,7 @@ We are now ready to start the GitLab application.
|
||||
```bash
|
||||
docker run --name gitlab -d --link gitlab-postgresql:postgresql \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
|
||||
@ -341,7 +341,7 @@ docker run --name gitlab -d \
|
||||
--env 'DB_HOST=192.168.1.100' --env 'DB_NAME=gitlabhq_production' \
|
||||
--env 'DB_USER=gitlab' --env 'DB_PASS=password' \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
#### Linking to MySQL Container
|
||||
@ -384,7 +384,7 @@ We are now ready to start the GitLab application.
|
||||
```bash
|
||||
docker run --name gitlab -d --link gitlab-mysql:mysql \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
|
||||
@ -411,7 +411,7 @@ The image can be configured to use an external redis server. The configuration s
|
||||
```bash
|
||||
docker run --name gitlab -it --rm \
|
||||
--env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
### Linking to Redis Container
|
||||
@ -438,7 +438,7 @@ We are now ready to start the GitLab application.
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -d --link gitlab-redis:redisio \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
### Mail
|
||||
@ -468,7 +468,7 @@ If you are using Gmail then all you need to do is:
|
||||
docker run --name gitlab -d \
|
||||
--env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
|
||||
@ -545,7 +545,7 @@ docker run --name gitlab -d \
|
||||
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
|
||||
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
|
||||
@ -561,7 +561,7 @@ docker run --name gitlab -d \
|
||||
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
|
||||
--env 'GITLAB_HTTPS_HSTS_MAXAGE=2592000' \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
If you want to completely disable HSTS set `GITLAB_HTTPS_HSTS_ENABLED` to `false`.
|
||||
@ -584,7 +584,7 @@ docker run --name gitlab -d \
|
||||
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
|
||||
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
|
||||
@ -632,7 +632,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
|
||||
docker run --name gitlab -it --rm \
|
||||
--env 'GITLAB_RELATIVE_URL_ROOT=/git' \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
|
||||
@ -718,14 +718,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
|
||||
```bash
|
||||
docker run --name gitlab -it --rm [options] \
|
||||
--env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
|
||||
sameersbn/gitlab:8.0.3
|
||||
sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -d [OPTIONS] \
|
||||
sameersbn/gitlab:8.0.3 app:sanitize
|
||||
sameersbn/gitlab:8.0.4 app:sanitize
|
||||
```
|
||||
|
||||
### Piwik
|
||||
@ -893,7 +893,7 @@ Execute the rake task to create a backup.
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -it --rm [OPTIONS] \
|
||||
sameersbn/gitlab:8.0.3 app:rake gitlab:backup:create
|
||||
sameersbn/gitlab:8.0.4 app:rake gitlab:backup:create
|
||||
```
|
||||
|
||||
A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
|
||||
@ -914,7 +914,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -it --rm [OPTIONS] \
|
||||
sameersbn/gitlab:8.0.3 app:rake gitlab:backup:restore
|
||||
sameersbn/gitlab:8.0.4 app:rake gitlab:backup:restore
|
||||
```
|
||||
|
||||
The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
|
||||
@ -923,7 +923,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -it --rm [OPTIONS] \
|
||||
sameersbn/gitlab:8.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
|
||||
sameersbn/gitlab:8.0.4 app:rake gitlab:backup:restore BACKUP=1417624827
|
||||
```
|
||||
|
||||
## Automated Backups
|
||||
@ -948,7 +948,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -d [OPTIONS] \
|
||||
sameersbn/gitlab:8.0.3 app:rake gitlab:env:info
|
||||
sameersbn/gitlab:8.0.4 app:rake gitlab:env:info
|
||||
```
|
||||
|
||||
You can also use `docker exec` to run raketasks on running gitlab instance. For example,
|
||||
@ -961,7 +961,7 @@ Similarly, to import bare repositories into GitLab project instance
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -d [OPTIONS] \
|
||||
sameersbn/gitlab:8.0.3 app:rake gitlab:import:repos
|
||||
sameersbn/gitlab:8.0.4 app:rake gitlab:import:repos
|
||||
```
|
||||
|
||||
Or
|
||||
@ -983,7 +983,7 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
|
||||
- **Step 1**: Update the docker image.
|
||||
|
||||
```bash
|
||||
docker pull sameersbn/gitlab:8.0.3
|
||||
docker pull sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
- **Step 2**: Stop and remove the currently running image
|
||||
@ -1007,7 +1007,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
|
||||
> **Note**: Since GitLab `8.0.0` you need to provide the `GITLAB_SECRETS_DB_KEY_BASE` parameter while starting the image.
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:8.0.3
|
||||
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:8.0.4
|
||||
```
|
||||
|
||||
## Shell Access
|
||||
|
||||
@ -7,7 +7,7 @@ postgresql:
|
||||
volumes:
|
||||
- /srv/docker/gitlab/postgresql:/var/lib/postgresql
|
||||
gitlab:
|
||||
image: sameersbn/gitlab:8.0.3
|
||||
image: sameersbn/gitlab:8.0.4
|
||||
links:
|
||||
- redis:redisio
|
||||
- postgresql:postgresql
|
||||
|
||||
@ -15,7 +15,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: gitlab
|
||||
image: sameersbn/gitlab:8.0.3
|
||||
image: sameersbn/gitlab:8.0.4
|
||||
env:
|
||||
- name: TZ
|
||||
value: Asia/Kolkata
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user