diff --git a/Changelog.md b/Changelog.md index c17353a2..f7616aaa 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,8 @@ # Changelog +**latest** +- update to the sameersbn/ubuntu:14.04.20140812 baseimage + **7.1.1** - removed "add_header X-Frame-Options DENY" setting from the nginx config. fixes #110 - upgrade to gitlab-ce 7.1.1 diff --git a/Dockerfile b/Dockerfile index a671beee..6246e8d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM sameersbn/ubuntu:14.04.20140628 +FROM sameersbn/ubuntu:14.04.20140812 MAINTAINER sameer@damagehead.com RUN add-apt-repository -y ppa:git-core/ppa && \