From f5cff43234837f59038ed68bcf855c6018df519e Mon Sep 17 00:00:00 2001 From: spiddy Date: Thu, 25 Sep 2014 12:59:57 +0200 Subject: [PATCH 1/2] Add fig.yml support --- fig.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 fig.yml diff --git a/fig.yml b/fig.yml new file mode 100644 index 00000000..9bd6948a --- /dev/null +++ b/fig.yml @@ -0,0 +1,20 @@ +mysql: + image: orchardup/mysql:latest + environment: + - MYSQL_USER=gitlab + - MYSQL_PASSWORD=airoaroonipouvua + - MYSQL_DATABASE=gitlabhq_production +gitlab: + image: sameersbn/gitlab:latest + links: + - redis:redisio + - mysql:mysql + ports: + - "80" + - "22" + environment: + - DB_USER=gitlab + - DB_PASS=airoaroonipouvua + - DB_NAME=gitlabhq_production +redis: + image: redis:2.8.9 From 1f6c0bb905e105571feeca9e9c7b858b009d8724 Mon Sep 17 00:00:00 2001 From: spiddy Date: Thu, 25 Sep 2014 13:51:00 +0200 Subject: [PATCH 2/2] Use postgres database instead of mysql (recommended by gitlab) --- fig.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fig.yml b/fig.yml index 9bd6948a..e53763ab 100644 --- a/fig.yml +++ b/fig.yml @@ -1,14 +1,14 @@ -mysql: - image: orchardup/mysql:latest +postgresql: + image: orchardup/postgresql:latest environment: - - MYSQL_USER=gitlab - - MYSQL_PASSWORD=airoaroonipouvua - - MYSQL_DATABASE=gitlabhq_production + - POSTGRESQL_USER=gitlab + - POSTGRESQL_PASS=airoaroonipouvua + - POSTGRESQL_DB=gitlabhq_production gitlab: image: sameersbn/gitlab:latest links: - redis:redisio - - mysql:mysql + - postgresql:postgresql ports: - "80" - "22"