archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-25 14:08:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1029 from timfeirg/master

Browse Source 
upgrade to CE v8.15.0
This commit is contained in:
Niclas Mietz 2016-12-26 13:53:01 +01:00 committed by GitHub
commit 80566356c3
12 changed files with 108 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog.md
View File

@ -2,6 +2,11 @@
This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
**8.15.0**
- gitlab: upgrade to CE v8.15.0
- gitlab-workhorse: upgrade to v1.2.1
- gitlab-shell: upgrade to v4.1.1
**8.14.5**
- gitlab: upgrade to CE v8.14.5

6
Dockerfile
View File

@ -1,11 +1,11 @@
FROM sameersbn/ubuntu:14.04.20161217
MAINTAINER sameer@damagehead.com
ENV GITLAB_VERSION=8.14.5 \
ENV GITLAB_VERSION=8.15.0 \
RUBY_VERSION=2.3 \
GOLANG_VERSION=1.6.3 \
GITLAB_SHELL_VERSION=4.0.3 \
GITLAB_WORKHORSE_VERSION=1.1.1 \
GITLAB_SHELL_VERSION=4.1.1 \
GITLAB_WORKHORSE_VERSION=1.2.1 \
GITLAB_USER="git" \
GITLAB_HOME="/home/git" \
GITLAB_LOG_DIR="/var/log/gitlab" \

60
README.md
View File

@ -1,6 +1,6 @@
[![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
[![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
# sameersbn/gitlab:8.14.5
# sameersbn/gitlab:8.15.0
- [Introduction](#introduction)
- [Changelog](Changelog.md)
@ -119,7 +119,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
> **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
```bash
docker pull sameersbn/gitlab:8.14.5
docker pull sameersbn/gitlab:8.15.0
```
You can also pull the `latest` tag which is built from the repository *HEAD*
@ -188,7 +188,7 @@ docker run --name gitlab -d \
--env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
--env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:8.14.5
sameersbn/gitlab:8.15.0
```
*Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@ -223,7 +223,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.14.5
sameersbn/gitlab:8.15.0
```
## Database
@ -256,7 +256,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.14.5
sameersbn/gitlab:8.15.0
```
#### Linking to PostgreSQL Container
@ -300,7 +300,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.14.5
sameersbn/gitlab:8.15.0
```
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:
@ -354,7 +354,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.14.5
sameersbn/gitlab:8.15.0
```
#### Linking to MySQL Container
@ -397,7 +397,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.14.5
sameersbn/gitlab:8.15.0
```
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:
@ -424,7 +424,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.14.5
sameersbn/gitlab:8.15.0
```
### Linking to Redis Container
@ -451,7 +451,7 @@ We are now ready to start the GitLab application.
```bash
docker run --name gitlab -d --link gitlab-redis:redisio \
sameersbn/gitlab:8.14.5
sameersbn/gitlab:8.15.0
```
### Mail
@ -464,7 +464,7 @@ If you are using Gmail then all you need to do is:
docker run --name gitlab -d \
--env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:8.14.5
sameersbn/gitlab:8.15.0
```
Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@ -484,7 +484,7 @@ docker run --name gitlab -d \
--env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
--env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:8.14.5
sameersbn/gitlab:8.15.0
```
Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@ -561,7 +561,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.14.5
sameersbn/gitlab:8.15.0
```
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.
@ -577,7 +577,7 @@ docker run --name gitlab -d \
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
--env 'NGINX_HSTS_MAXAGE=2592000' \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:8.14.5
sameersbn/gitlab:8.15.0
```
If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@ -600,7 +600,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.14.5
sameersbn/gitlab:8.15.0
```
Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@ -648,7 +648,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.14.5
sameersbn/gitlab:8.15.0
```
GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@ -766,14 +766,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.14.5
sameersbn/gitlab:8.15.0
```
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.14.5 app:sanitize
sameersbn/gitlab:8.15.0 app:sanitize
```
### Piwik
@ -833,6 +833,8 @@ Below is the complete list of available options that can be used to customize yo
| `GITLAB_ARTIFACTS_DIR` | Directory to store the artifacts. Defaults to `$GITLAB_SHARED_DIR/artifacts` |
| `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. |
| `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` |
| `GITLAB_MATTERMOST_ENABLED` | Enable/Disable GitLab Mattermost for *Add Mattermost button*. Defaults to `false`. |
| `GITLAB_MATTERMOST_URL` | Sets Mattermost URL. Defaults to `https://mattermost.example.com`. |
| `GITLAB_BACKUP_SCHEDULE` | Setup cron job to automatic backups. Possible values `disable`, `daily`, `weekly` or `monthly`. Disabled by default |
| `GITLAB_BACKUP_EXPIRY` | Configure how long (in seconds) to keep backups before they are deleted. By default when automated backups are disabled backups are kept forever (0 seconds), else the backups expire in 7 days (604800 seconds). |
| `GITLAB_BACKUP_PG_SCHEMA` | Specify the PostgreSQL schema for the backups. No defaults, which means that all schemas will be backed up. see #524 |
@ -938,6 +940,10 @@ Below is the complete list of available options that can be used to customize yo
| `OAUTH_FACEBOOK_APP_SECRET` | Facebook App API secret. No defaults. |
| `OAUTH_TWITTER_API_KEY` | Twitter App API key. No defaults. |
| `OAUTH_TWITTER_APP_SECRET` | Twitter App API secret. No defaults. |
| `OAUTH_AUTHENTIQ_CLIENT_ID` | authentiq Client ID. No defaults. |
| `OAUTH_AUTHENTIQ_CLIENT_SECRET` | authentiq Client secret. No defaults. |
| `OAUTH_AUTHENTIQ_SCOPE` | Scope of Authentiq Application Defaults to `'aq:name email~rs address aq:push'`|
| `OAUTH_AUTHENTIQ_REDIRECT_URI` | Callback URL for Authentiq. No defaults. |
| `OAUTH_GITHUB_API_KEY` | GitHub App Client ID. No defaults. |
| `OAUTH_GITHUB_APP_SECRET` | GitHub App Client secret. No defaults. |
| `OAUTH_GITHUB_URL` | Url to the GitHub Enterprise server. Defaults to https://github.com |
@ -1005,7 +1011,7 @@ Execute the rake task to create a backup.
```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:8.14.5 app:rake gitlab:backup:create
sameersbn/gitlab:8.15.0 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.
@ -1040,7 +1046,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.14.5 app:rake gitlab:backup:restore
sameersbn/gitlab:8.15.0 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.
@ -1049,7 +1055,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.14.5 app:rake gitlab:backup:restore BACKUP=1417624827
sameersbn/gitlab:8.15.0 app:rake gitlab:backup:restore BACKUP=1417624827
```
When using `docker-compose` you may use the following command to execute the restore.
@ -1087,7 +1093,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:8.14.5 app:rake gitlab:env:info
sameersbn/gitlab:8.15.0 app:rake gitlab:env:info
```
You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@ -1100,7 +1106,7 @@ Similarly, to import bare repositories into GitLab project instance
```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:8.14.5 app:rake gitlab:import:repos
sameersbn/gitlab:8.15.0 app:rake gitlab:import:repos
```
Or
@ -1131,7 +1137,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:8.14.5 app:rake gitlab:import:repos
sameersbn/gitlab:8.15.0 app:rake gitlab:import:repos
```
Watch the logs and your repositories should be available into your new gitlab container.
@ -1153,12 +1159,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
> **Note**
>
> Upgrading to `sameersbn/gitlab:8.14.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
> Upgrading to `sameersbn/gitlab:8.15.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
- **Step 1**: Update the docker image.
```bash
docker pull sameersbn/gitlab:8.14.5
docker pull sameersbn/gitlab:8.15.0
```
- **Step 2**: Stop and remove the currently running image
@ -1184,7 +1190,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
> **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
```bash
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:8.14.5
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:8.15.0
```
## Shell Access

2
VERSION
View File

@ -1 +1 @@
8.14.5
8.15.0

10
assets/runtime/config/gitlabhq/gitlab.yml
View File

@ -155,6 +155,12 @@ production: &base
# The location where LFS objects are stored (default: shared/lfs-objects).
storage_path: {{GITLAB_LFS_OBJECTS_DIR}}
## Mattermost
## For enabling Add to Mattermost button
mattermost:
enabled: {{GITLAB_MATTERMOST_ENABLED}}
host: '{{GITLAB_MATTERMOST_URL}}'
## Gravatar
## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html
gravatar:
@ -365,6 +371,10 @@ production: &base
login_url: '{{OAUTH_CAS3_LOGIN_URL}}',
service_validate_url: '{{OAUTH_CAS3_VALIDATE_URL}}',
logout_url: '{{OAUTH_CAS3_LOGOUT_URL}}'} }
- { name: 'authentiq',
app_id: '{{OAUTH_AUTHENTIQ_CLIENT_ID}}',
app_secret: 'OAUTH_AUTHENTIQ_CLIENT_SECRET',
args: { scope: {{OAUTH_AUTHENTIQ_SCOPE}}, redirect_uri: '{{OAUTH_AUTHENTIQ_REDIRECT_URI}}' } }
- { name: 'github',
label: 'GitHub',
app_id: '{{OAUTH_GITHUB_API_KEY}}',

2
assets/runtime/config/gitlabhq/unicorn.rb
View File

@ -44,7 +44,7 @@ listen "127.0.0.1:8080", :tcp_nopush => true
# nuke workers after 30 seconds instead of 60 seconds (the default)
#
# NOTICE: git push over http depends on this value.
# If you want be able to push huge amount of data to git repository over http
# If you want to be able to push huge amount of data to git repository over http
# you will have to increase this value too.
#
# Example of output if you try to push 1GB repo to GitLab over http.

7
assets/runtime/config/nginx/gitlab
View File

@ -20,6 +20,11 @@ upstream gitlab-workhorse {
server localhost:8181 fail_timeout=0;
}
map $http_upgrade $connection_upgrade_gitlab {
default upgrade;
'' close;
}
## Normal HTTP host
server {
## Either remove "default_server" from the listen line below,
@ -56,6 +61,8 @@ server {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto {{NGINX_X_FORWARDED_PROTO}};
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade_gitlab;
proxy_pass http://gitlab-workhorse;
}

8
assets/runtime/config/nginx/gitlab-ssl
View File

@ -24,6 +24,11 @@ upstream gitlab-workhorse {
server localhost:8181 fail_timeout=0;
}
map $http_upgrade $connection_upgrade_gitlab {
default upgrade;
'' close;
}
## Redirects all HTTP traffic to the HTTPS host
server {
## Either remove "default_server" from the listen line below,
@ -103,6 +108,9 @@ server {
proxy_set_header X-Forwarded-Ssl on;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto {{NGINX_X_FORWARDED_PROTO}};
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade_gitlab_ssl;
proxy_pass http://gitlab-workhorse;
}

10
assets/runtime/env-defaults
View File

@ -105,6 +105,10 @@ GITLAB_ARTIFACTS_DIR="${GITLAB_ARTIFACTS_DIR:-$GITLAB_SHARED_DIR/artifacts}"
GITLAB_LFS_ENABLED=${GITLAB_LFS_ENABLED:-true}
GITLAB_LFS_OBJECTS_DIR="${GITLAB_LFS_OBJECTS_DIR:-$GITLAB_SHARED_DIR/lfs-objects}"
## Mattermose
GITLAB_MATTERMOST_ENABLED=${GITLAB_MATTERMOST_ENABLED:-false}
GITLAB_MATTERMOST_URL=${GITLAB_MATTERMOST_URL:-https://mattermost.example.com}
GITLAB_SECRETS_DB_KEY_BASE=${GITLAB_SECRETS_DB_KEY_BASE:-}
GITLAB_SECRETS_SECRET_KEY_BASE=${GITLAB_SECRETS_SECRET_KEY_BASE:-}
GITLAB_SECRETS_OTP_KEY_BASE=${GITLAB_SECRETS_OTP_KEY_BASE:-}
@ -262,6 +266,12 @@ OAUTH_FACEBOOK_APP_SECRET=${OAUTH_FACEBOOK_APP_SECRET:-}
OAUTH_TWITTER_API_KEY=${OAUTH_TWITTER_API_KEY:-}
OAUTH_TWITTER_APP_SECRET=${OAUTH_TWITTER_APP_SECRET:-}
## Authentiq
OAUTH_AUTHENTIQ_CLIENT_ID=${OAUTH_AUTHENTIQ_CLIENT_ID:-}
OAUTH_AUTHENTIQ_CLIENT_SECRET=${OAUTH_AUTHENTIQ_CLIENT_SECRET:-}
OAUTH_AUTHENTIQ_SCOPE=${OAUTH_AUTHENTIQ_SCOPE:-'aq:name email~rs address aq:push'}
OAUTH_AUTHENTIQ_REDIRECT_URI=${OAUTH_AUTHENTIQ_REDIRECT_URI:-}
### GITHUB
OAUTH_GITHUB_API_KEY=${OAUTH_GITHUB_API_KEY:-}
OAUTH_GITHUB_APP_SECRET=${OAUTH_GITHUB_APP_SECRET:-}

23
assets/runtime/functions
View File

@ -489,6 +489,20 @@ gitlab_configure_oauth_twitter() {
fi
}
gitlab_configure_oauth_authentiq() {
if [[ -n ${OAUTH_AUTHENTIQ_CLIENT_ID} && -n ${OAUTH_AUTHENTIQ_CLIENT_SECRET} ]]; then
echo "Configuring gitlab::oauth::authentiq..."
OAUTH_ENABLED=${OAUTH_ENABLED:-true}
update_template ${GITLAB_CONFIG} \
OAUTH_AUTHENTIQ_CLIENT_ID \
OAUTH_AUTHENTIQ_CLIENT_SECRET \
OAUTH_AUTHENTIQ_SCOPE \
OAUTH_AUTHENTIQ_REDIRECT_URI
else
exec_as_git sed -i "/name: 'authentiq'/,/{{OAUTH_AUTHENTIQ_SCOPE}}/d" ${GITLAB_CONFIG}
fi
}
gitlab_configure_oauth_github() {
if [[ -n ${OAUTH_GITHUB_API_KEY} && -n ${OAUTH_GITHUB_APP_SECRET} ]]; then
echo "Configuring gitlab::oauth::github..."
@ -623,6 +637,7 @@ gitlab_configure_oauth() {
gitlab_configure_oauth_google
gitlab_configure_oauth_facebook
gitlab_configure_oauth_twitter
gitlab_configure_oauth_authentiq
gitlab_configure_oauth_github
gitlab_configure_oauth_gitlab
gitlab_configure_oauth_bitbucket
@ -832,6 +847,13 @@ gitlab_configure_lfs() {
GITLAB_LFS_OBJECTS_DIR
}
gitlab_configure_mattermost() {
echo "Configuring gitlab::mattermost..."
update_template ${GITLAB_CONFIG} \
GITLAB_MATTERMOST_ENABLED \
GITLAB_MATTERMOST_URL
}
gitlab_configure_project_features() {
echo "Configuring gitlab::project_features..."
update_template ${GITLAB_CONFIG} \
@ -1242,6 +1264,7 @@ configure_gitlab() {
gitlab_configure_ci
gitlab_configure_artifacts
gitlab_configure_lfs
gitlab_configure_mattermost
gitlab_configure_project_features
gitlab_configure_mail_delivery
gitlab_configure_mailroom

12
docs/container_registry.md
View File

@ -96,7 +96,7 @@ services:
gitlab:
restart: always
image: sameersbn/gitlab:8.14.5
image: sameersbn/gitlab:8.15.0
depends_on:
- redis
- postgresql
@ -282,7 +282,7 @@ docker stop registry gitlab && docker rm registry gitlab
Execute the rake task with a removeable container.
```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:8.14.5 app:rake gitlab:backup:create
sameersbn/gitlab:8.15.0 app:rake gitlab:backup:create
```
## Restoring Backups
@ -298,7 +298,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.14.5 app:rake gitlab:backup:restore
sameersbn/gitlab:8.15.0 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.
@ -307,7 +307,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.14.5 app:rake gitlab:backup:restore BACKUP=1417624827
sameersbn/gitlab:8.15.0 app:rake gitlab:backup:restore BACKUP=1417624827
```
# Upgrading from an existing GitLab installation
@ -318,7 +318,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
- **Step 1**: Update the docker image.
```bash
docker pull sameersbn/gitlab:8.14.5
docker pull sameersbn/gitlab:8.15.0
```
- **Step 2**: Stop and remove the currently running image
@ -370,7 +370,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
--env 'GITLAB_REGISTRY_API_URL=http://registry:5000/' \
--env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
--link registry:registry
sameersbn/gitlab:8.14.5
sameersbn/gitlab:8.15.0
```

2
kubernetes/gitlab-rc.yml
View File

@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: gitlab
image: sameersbn/gitlab:8.14.5
image: sameersbn/gitlab:8.15.0
env:
- name: TZ
value: Asia/Kolkata