summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Catteau <fcatteau@gitlab.com>2018-06-22 08:40:00 -0400
committerFabien Catteau <fcatteau@gitlab.com>2018-06-22 08:40:00 -0400
commitea65d3b868d1f955084a1d20451e77557c1e9a4d (patch)
tree9172f5735e40a0221e24f497a892a4869db84e97
parent70b8f51792b4445539f7fa05caaab36fcda963ab (diff)
parentbe52110711d5fd5f15a4d70b74e20144bc3aab23 (diff)
Merge branch 'fix-add-realpath' into 11-0-stable11-0-stable
-rw-r--r--CHANGELOG.md2
-rw-r--r--Dockerfile4
-rw-r--r--VERSION2
3 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e58915..2b1965a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
# GitLab License management changelog
+## 11-1-stable
+
## 11-0-stable
- Initial release
diff --git a/Dockerfile b/Dockerfile
index 9ff5519..b6b1e80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ MAINTAINER GitLab
RUN npm install npm-install-peers cheerio
-# Don't let Rubygem fail with the numerous projects using PG or MySQL
-RUN apt-get update && apt-get install -y libpq-dev libmysqlclient-dev && rm -rf /var/lib/apt/lists/*
+# Don't let Rubygem fail with the numerous projects using PG or MySQL, install realpath
+RUN apt-get update && apt-get install -y libpq-dev libmysqlclient-dev realpath && rm -rf /var/lib/apt/lists/*
COPY run.sh html2json.js /
COPY test /test
diff --git a/VERSION b/VERSION
index b743821..72f7831 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11-0-stable
+11-1-stable