From c005139fd8fe89bf4c1d5eee6e6b717903f3daee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Sat, 23 Jun 2018 17:22:44 +0200
Subject: [PATCH] Adding docker-service to docker role, and add a sample gitea
 service.

---
 datacoop_hosts                                |   4 +-
 .../docker/files/composefiles/.gitea.yml.swp  | Bin 0 -> 12288 bytes
 roles/docker/files/composefiles/gitea.yml     |  38 ++++++++++++++++++
 roles/docker/tasks/main.yml                   |  11 +++++
 roles/docker/tasks/services.yml               |   5 +++
 roles/ubuntu_base/tasks/base.yml              |   9 +++--
 6 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 roles/docker/files/composefiles/.gitea.yml.swp
 create mode 100644 roles/docker/files/composefiles/gitea.yml
 create mode 100644 roles/docker/tasks/services.yml

diff --git a/datacoop_hosts b/datacoop_hosts
index 55b667f4..5fd8e2b7 100644
--- a/datacoop_hosts
+++ b/datacoop_hosts
@@ -1,7 +1,7 @@
 ######################################
 ### All hosts
-10.1.1.198
-10.1.1.199
+10.1.1.198 ansible_python_interpreter=/usr/bin/python3
+10.1.1.199 ansible_python_interpreter=/usr/bin/python3
 
 ######################################
 ### Application servers
diff --git a/roles/docker/files/composefiles/.gitea.yml.swp b/roles/docker/files/composefiles/.gitea.yml.swp
new file mode 100644
index 0000000000000000000000000000000000000000..cf70f960803c854878818570fe362d0326a15f24
GIT binary patch
literal 12288
zcmeI2&1(}u7>6fC(Sxm`c=Ir(Ab99*x&d1ka!?XV57LqtKM)DC*=bn1*@?5;)LiuB
z#XrEKe}jT}vL2<L^ytN_;7zYW#ox@PNz_=uoB9qsnan%ye7sM{A!LKnwbd(p*(ou!
z6O3(z&aJOAbA`i)80(8Tkh)`L4s18PCA<8<Buw5LZs@jEDBVzG!f7kjb48LyK`dRZ
zVwt+3YHv#IZbW9#R^6UTWj^RcnH0{T8~^SgnkNHfV2XiRR`wR{cXhsamY+J=oRUK!
zGC&5%02v?yWPl8i0Wv@a{#656ufXo3xS3&r=Z1aZhkiJujtr0iGC&5%02v?yWPl8i
z0Wv@a$N(Am3k`^nvAtuAJ)Onn@&Et+@Bh!o8T$l2fcM}v*aa`aGw=vJ01Dg$HLwKE
zgEQbL*qdYQBX|dP!47x<o`c8WAsB$$paSN>X>bI5!F}F>H{cc60p^ZR05vi|2FL&z
zAOmE843GgbKnBRbe_?=gJP@6Av`l@*xqT$sXMGiKbxi~z(-y`_ZeM6Ojskao*`3%v
zdd*DUXq_3DWp+Pi-X}8KR(jK(V#W)6eXVhIrCw{as+TL{yzge#FEtw1*Xq?@%{Lph
z`ox?}`jJ*iS0<S$hI3Sv37z>|#M@$!+E~;T9qEq?y69X$JPam^4Fj7Q%AQQZw55`K
zH*>Y3=Xt*86>WkIluM<OZ(j0PPw8x;$Xw_j7@Br<bDk-=wX#~REaJ$~Eo`(o8U4w{
zux@)HH@{XaG6=#ZsnmU`eP;ToJ^J9~-Aw94#6I5;aVn9RuVdp6lVM#N!4S+i<s$nA
Dqf6&J

literal 0
HcmV?d00001

diff --git a/roles/docker/files/composefiles/gitea.yml b/roles/docker/files/composefiles/gitea.yml
new file mode 100644
index 00000000..09081f37
--- /dev/null
+++ b/roles/docker/files/composefiles/gitea.yml
@@ -0,0 +1,38 @@
+version: "2.3"
+
+networks:
+  gitea:
+    external: false
+
+services:
+  server:
+    image: gitea/gitea:latest
+    environment:
+      - USER_UID=1000
+      - USER_GID=1000
+    restart: always
+    networks:
+      - gitea
+    volumes:
+      - gitea:/data
+    ports:
+      - "3000:3000"
+      - "222:22"
+    depends_on:
+      - db
+
+  db:
+    image: postgres:9.6
+    restart: always
+    environment:
+      - POSTGRES_USER=gitea
+      - POSTGRES_PASSWORD=gitea
+      - POSTGRES_DB=gitea
+    networks:
+      - gitea
+    volumes:
+      - postgres:/var/lib/postgresql/data
+
+volumes:
+  gitea:
+  postgres:
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 4670c248..ba626fc9 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -15,3 +15,14 @@
   apt:
     name: docker-ce
     state: present
+
+- name: install docker python bindings
+  pip:
+    executable: "pip3"
+    name: "{{ item }}"
+    state: present
+  with_items:
+    - docker-compose
+
+- name: setup services
+  include_tasks: services.yml
diff --git a/roles/docker/tasks/services.yml b/roles/docker/tasks/services.yml
new file mode 100644
index 00000000..27baa935
--- /dev/null
+++ b/roles/docker/tasks/services.yml
@@ -0,0 +1,5 @@
+- name: setup gitea
+  docker_service:
+    project_name: gitea
+    definition:
+        "{{ lookup('file', 'composefiles/gitea.yml') | from_yaml }}"
diff --git a/roles/ubuntu_base/tasks/base.yml b/roles/ubuntu_base/tasks/base.yml
index 058ad625..eddff22b 100644
--- a/roles/ubuntu_base/tasks/base.yml
+++ b/roles/ubuntu_base/tasks/base.yml
@@ -1,5 +1,8 @@
 ---
-- name: Install aptitude if missing
+- name: Install necessary packages
   apt:
-    name: aptitude
-    state: present
\ No newline at end of file
+    name: "{{ item }}"
+    state: present
+  with_items:
+    - aptitude
+    - python3-pip