diff --git a/Dockerfile b/Dockerfile index 89e0afd8..02b6d602 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM sameersbn/ubuntu:14.04.20170724 MAINTAINER sameer@damagehead.com -ENV GITLAB_VERSION=10.0.4 \ +ENV GITLAB_VERSION=10.1.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.8.3 \ - GITLAB_SHELL_VERSION=5.9.0 \ - GITLAB_WORKHORSE_VERSION=3.0.0 \ - GITLAB_PAGES_VERSION=0.5.1 \ - GITALY_SERVER_VERSION=0.38.0 \ + GITLAB_SHELL_VERSION=5.9.3 \ + GITLAB_WORKHORSE_VERSION=3.2.0 \ + GITLAB_PAGES_VERSION=0.6.0 \ + GITALY_SERVER_VERSION=0.43.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index eff5f839..895f61d6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![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:10.0.4 +# sameersbn/gitlab:10.1.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.0.4 +docker pull sameersbn/gitlab:10.1.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.0.4 + sameersbn/gitlab:10.1.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.0.4 + sameersbn/gitlab:10.1.0 ``` ## Database @@ -263,7 +263,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:10.0.4 + sameersbn/gitlab:10.1.0 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.0.4 + sameersbn/gitlab:10.1.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: @@ -361,7 +361,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:10.0.4 + sameersbn/gitlab:10.1.0 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.0.4 + sameersbn/gitlab:10.1.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: @@ -431,7 +431,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:10.0.4 + sameersbn/gitlab:10.1.0 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.0.4 + sameersbn/gitlab:10.1.0 ``` ### Mail @@ -471,7 +471,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:10.0.4 + sameersbn/gitlab:10.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.0.4 + sameersbn/gitlab:10.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.0.4 + sameersbn/gitlab:10.1.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. @@ -584,7 +584,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:10.0.4 + sameersbn/gitlab:10.1.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.0.4 + sameersbn/gitlab:10.1.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.0.4 + sameersbn/gitlab:10.1.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.0.4 + sameersbn/gitlab:10.1.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:10.0.4 app:sanitize + sameersbn/gitlab:10.1.0 app:sanitize ``` ### Piwik @@ -1058,7 +1058,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.0.4 app:rake gitlab:backup:create + sameersbn/gitlab:10.1.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. @@ -1086,14 +1086,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.0.4 app:rake db:setup + sameersbn/gitlab:10.1.0 app:rake db:setup ``` Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.0.4 app:rake gitlab:backup:restore + sameersbn/gitlab:10.1.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. @@ -1102,7 +1102,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.0.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1151,7 +1151,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:10.0.4 app:rake gitlab:env:info + sameersbn/gitlab:10.1.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1164,7 +1164,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.0.4 app:rake gitlab:import:repos + sameersbn/gitlab:10.1.0 app:rake gitlab:import:repos ``` Or @@ -1195,7 +1195,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.0.4 app:rake gitlab:import:repos + sameersbn/gitlab:10.1.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1217,12 +1217,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.0.4` 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:10.1.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:10.0.4 +docker pull sameersbn/gitlab:10.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1248,7 +1248,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:10.0.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.1.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 6b48f258..4149c39e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.0.4 +10.1.0 diff --git a/assets/build/install.sh b/assets/build/install.sh index 1e0ed45b..5c40ab36 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -4,8 +4,8 @@ set -e GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-ce.git GITLAB_SHELL_URL=https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz GITLAB_WORKHORSE_URL=https://gitlab.com/gitlab-org/gitlab-workhorse.git -GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages/repository/archive.tar.gz -GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly/repository/archive.tar.gz +GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git +GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git GEM_CACHE_DIR="${GITLAB_BUILD_DIR}/cache" @@ -105,34 +105,26 @@ PATH=/tmp/go/bin:$PATH GOROOT=/tmp/go make install #download pages echo "Downloading gitlab-pages v.${GITLAB_PAGES_VERSION}..." -mkdir -p ${GITLAB_PAGES_INSTALL_DIR} -wget -cq ${GITLAB_PAGES_URL}?ref=v${GITLAB_PAGES_VERSION} -O ${GITLAB_BUILD_DIR}/gitlab-pages-${GITLAB_PAGES_VERSION}.tar.gz -tar xf ${GITLAB_BUILD_DIR}/gitlab-pages-${GITLAB_PAGES_VERSION}.tar.gz --strip 1 -C ${GITLAB_PAGES_INSTALL_DIR} -rm -rf ${GITLAB_BUILD_DIR}/gitlab-pages-${GITLAB_PAGES_VERSION}.tar.gz +exec_as_git git clone -q -b v${GITLAB_PAGES_VERSION} --depth 1 ${GITLAB_PAGES_URL} ${GITLAB_PAGES_INSTALL_DIR} chown -R ${GITLAB_USER}: ${GITLAB_PAGES_INSTALL_DIR} #install gitlab-pages cd ${GITLAB_PAGES_INSTALL_DIR} -GODIR=/tmp/go/src/gitlab.com/gitlab-org/gitlab-pages -mkdir -p "$(dirname "$GODIR")" -ln -sfv "$(pwd -P)" "$GODIR" -cd "$GODIR" -PATH=/tmp/go/bin:$PATH GOROOT=/tmp/go make gitlab-pages -mv gitlab-pages /usr/local/bin/ +PATH=/tmp/go/bin:$PATH GOROOT=/tmp/go make +cp -f gitlab-pages /usr/local/bin/ # download gitaly echo "Downloading gitaly v.${GITALY_SERVER_VERSION}..." -mkdir -p ${GITLAB_GITALY_INSTALL_DIR} -wget -cq ${GITLAB_GITALY_URL}?ref=v${GITALY_SERVER_VERSION} -O ${GITLAB_BUILD_DIR}/gitaly-${GITALY_SERVER_VERSION}.tar.gz -tar xf ${GITLAB_BUILD_DIR}/gitaly-${GITALY_SERVER_VERSION}.tar.gz --strip 1 -C ${GITLAB_GITALY_INSTALL_DIR} -rm -rf ${GITLAB_BUILD_DIR}/gitaly-${GITALY_SERVER_VERSION}.tar.gz +exec_as_git git clone -q -b v${GITALY_SERVER_VERSION} --depth 1 ${GITLAB_GITALY_URL} ${GITLAB_GITALY_INSTALL_DIR} chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR} # copy default config for gitaly exec_as_git cp ${GITLAB_GITALY_INSTALL_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR}/config.toml # install gitaly cd ${GITLAB_GITALY_INSTALL_DIR} -PATH=/tmp/go/bin:$PATH GOROOT=/tmp/go make install && make clean +ln -sf /tmp/go /usr/local/go +PATH=/tmp/go/bin:$PATH make install && make clean +rm -f /usr/local/go # remove go rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz /tmp/go @@ -337,7 +329,7 @@ directory=${GITLAB_GITALY_INSTALL_DIR} environment=HOME=${GITLAB_HOME} command=/usr/local/bin/gitaly ${GITLAB_GITALY_INSTALL_DIR}/config.toml user=git -autostart={{GITALY_ENABLED}} +autostart=true autorestart=true stdout_logfile=${GITLAB_LOG_DIR}/supervisor/%(program_name)s.log stderr_logfile=${GITLAB_LOG_DIR}/supervisor/%(program_name)s.log diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 3c535bcf..b2415c83 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -91,7 +91,7 @@ production: &base # This happens when the commit is pushed or merged into the default branch of a project. # When not specified the default issue_closing_pattern as specified below will be used. # Tip: you can test your closing pattern at http://rubular.com. - # issue_closing_pattern: '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing))(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)' + # issue_closing_pattern: '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)|[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)' ## Default project features settings default_projects_features: @@ -166,6 +166,7 @@ production: &base host: {{GITLAB_PAGES_DOMAIN}} port: {{GITLAB_PAGES_PORT}} # Set to 443 if you serve the pages with HTTPS https: {{GITLAB_PAGES_HTTPS}} # Set to true if you serve the pages with HTTPS + artifacts_server: {{GITLAB_PAGES_ARTIFACTS_SERVER}} external_http: {{GITLAB_PAGES_EXTERNAL_HTTP}} # If defined, enables custom domain support in GitLab Pages external_https: {{GITLAB_PAGES_EXTERNAL_HTTPS}} # If defined, enables custom domain and certificate support in GitLab Pages @@ -469,18 +470,11 @@ production: &base # Gitaly settings gitaly: - # The socket_path setting is optional and obsolete. When this is set - # GitLab assumes it can reach a Gitaly services via a Unix socket at - # this path. When this is commented out GitLab will not use Gitaly. - # - # This setting is obsolete because we expect it to be moved under - # repositories/storages in GitLab 9.1. - # - # socket_path: tmp/sockets/gitaly.socket - # This setting controls whether GitLab uses Gitaly (new component - # introduced in 9.0). Eventually Gitaly use will become mandatory and - # this option will disappear. - enabled: {{GITALY_ENABLED}} + # Path to the directory containing Gitaly client executables. + client_path: {{GITALY_CLIENT_PATH}} + # Default Gitaly authentication token. Can be overriden per storage. Can + # be left blank when Gitaly is running locally on a Unix socket, which + # is the normal way to deploy Gitaly. token: {{GITALY_TOKEN}} # diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index fd3c7fe5..09571ee9 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -377,12 +377,13 @@ GITLAB_PAGES_ENABLED=${GITLAB_PAGES_ENABLED:-false} GITLAB_PAGES_DOMAIN=${GITLAB_PAGES_DOMAIN:-"example.com"} GITLAB_PAGES_DIR="${GITLAB_PAGES_DIR:-$GITLAB_SHARED_DIR/pages}" GITLAB_PAGES_PORT=${GITLAB_PAGES_PORT:-80} +GITLAB_PAGES_ARTIFACTS_SERVER=${GITLAB_PAGES_ARTIFACTS_SERVER:-true} GITLAB_PAGES_HTTPS=${GITLAB_PAGES_HTTPS:-false} GITLAB_PAGES_EXTERNAL_HTTP=${GITLAB_PAGES_EXTERNAL_HTTP:-} GITLAB_PAGES_EXTERNAL_HTTPS=${GITLAB_PAGES_EXTERNAL_HTTPS:-} ## Gitaly -GITALY_ENABLED=${GITALY_ENABLED:-true} +GITALY_CLIENT_PATH=${GITALY_CLIENT_PATH:-$GITLAB_GITALY_INSTALL_DIR} GITALY_TOKEN=${GITALY_TOKEN:-} GITALY_SOCKET_PATH=${GITLAB_INSTALL_DIR}/tmp/sockets/private/gitaly.socket GITALY_ADDRESS=${GITALY_ADDRESS:-unix:$GITALY_SOCKET_PATH} diff --git a/assets/runtime/functions b/assets/runtime/functions index 5cde49b4..554c5fa7 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -275,14 +275,12 @@ gitlab_configure_redis() { gitlab_configure_gitaly() { echo "Configuring gitlab::gitaly..." - update_template /etc/supervisor/conf.d/gitaly.conf GITALY_ENABLED - update_template ${GITLAB_GITALY_CONFIG} \ GITALY_SOCKET_PATH \ GITLAB_REPOS_DIR update_template ${GITLAB_CONFIG} \ - GITALY_ENABLED \ + GITALY_CLIENT_PATH \ GITALY_TOKEN } @@ -984,7 +982,8 @@ gitlab_configure_pages(){ GITLAB_PAGES_ENABLED \ GITLAB_PAGES_DOMAIN \ GITLAB_PAGES_PORT \ - GITLAB_PAGES_HTTPS + GITLAB_PAGES_HTTPS \ + GITLAB_PAGES_ARTIFACTS_SERVER if [[ -n ${GITLAB_PAGES_EXTERNAL_HTTP} ]]; then update_template ${GITLAB_CONFIG} \ @@ -1411,9 +1410,7 @@ install_configuration_templates() { fi fi - if [[ ${GITALY_ENABLED} == true ]]; then - install_template ${GITLAB_USER}: gitaly/config.toml ${GITLAB_GITALY_CONFIG} - fi + install_template ${GITLAB_USER}: gitaly/config.toml ${GITLAB_GITALY_CONFIG} } configure_gitlab() { diff --git a/docker-compose.yml b/docker-compose.yml index 31528c06..21806cf1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.0.4 + image: sameersbn/gitlab:10.1.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index fd8e1d35..f08e29f6 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -95,7 +95,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.0.4 + image: sameersbn/gitlab:10.1.0 depends_on: - redis - postgresql @@ -281,7 +281,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:10.0.4 app:rake gitlab:backup:create + sameersbn/gitlab:10.1.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -297,7 +297,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:10.0.4 app:rake gitlab:backup:restore + sameersbn/gitlab:10.1.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. @@ -306,7 +306,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.0.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -317,7 +317,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:10.0.4 +docker pull sameersbn/gitlab:10.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -370,7 +370,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:10.0.4 +sameersbn/gitlab:10.1.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 28847fe0..ab855360 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.0.4 + image: sameersbn/gitlab:10.1.0 env: - name: TZ value: Asia/Kolkata