diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-03 15:20:17 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-03 15:20:17 +0000 |
| commit | 88326858a45829431045c12d0cc09def4f5c128e (patch) | |
| tree | 0eb1d20cc3d0450b6ebea73e993ab8f3d1467712 | |
| parent | 6c68db60910839a6a0009a18992281f1d5ff899b (diff) | |
| parent | 2a0ee91f7ca3008d6bbdd10a7351485d1fa0468f (diff) | |
| download | gitlab-ce-88326858a45829431045c12d0cc09def4f5c128e.tar.gz | |
Merge branch 'add-docker-to-changelog' into 'master'
Add docker to changelog
See merge request !1293
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | docker/Dockerfile | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index ba3cdfa0e52..ae8de1df277 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,7 +17,7 @@ v 7.6.0 - Change maximum avatar file size from 100KB to 200KB - - - - + - In the docker directory is a container template based on the Omnibus packages. - - diff --git a/docker/Dockerfile b/docker/Dockerfile index 3ffedd16e81..d0b5338773e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,4 @@ FROM ubuntu:14.04 -MAINTAINER Vincent Robert <vincent.robert@genezys.net> # Install required packages RUN apt-get update -q \ |