diff options
| author | dosire <sytses@gmail.com> | 2014-02-20 16:51:16 +0100 |
|---|---|---|
| committer | dosire <sytses@gmail.com> | 2014-02-20 16:51:16 +0100 |
| commit | 798cef71c462831971fe35d53ea8b2c8afbd80a8 (patch) | |
| tree | 2f5d3d1716d1e0e6ee01a3afa227c9632beabcd1 | |
| parent | efdf9b7b3b926fda7e0072f0d4224a7e2d68ebf8 (diff) | |
| download | gitlab-ce-798cef71c462831971fe35d53ea8b2c8afbd80a8.tar.gz | |
Choose a db and run the install script with bash and a version. Thanks Marin
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | solo.json | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index c3396d29bba..27595fe84a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,9 @@ FROM ubuntu:12.10 RUN apt-get -y update RUN apt-get -y install curl build-essential libxml2-dev libxslt-dev git -RUN curl -L https://www.opscode.com/chef/install.sh | bash + +ADD https://www.opscode.com/chef/install.sh install.sh +RUN bash ./install.sh -v 11.4.4 RUN echo "gem: --no-ri --no-rdoc" > ~/.gemrc RUN /opt/chef/embedded/bin/gem install berkshelf diff --git a/solo.json b/solo.json index e7705b2900a..f119ea8b7dc 100644 --- a/solo.json +++ b/solo.json @@ -4,7 +4,7 @@ "url": "http://example.com/", "email_from": "gitlab@example.com", "support_email": "support@example.com", - "database_adapter": "mysql or postgresql", + "database_adapter": "postgresql", "database_password": "database password used by the GitLab application", "repository": "clone URL for e.g. GitLab Enterprise Edition; omit this line to use Community Edition", "revision": "branch or tag or SHA1 to install a specific version of GitLab, e.g. 6-4-stable" |