From fad3b662dac5c9552668a8e34aa5cf8d95abbf5a Mon Sep 17 00:00:00 2001
From: Jonathan Chan <afnl686@gmail.com>
Date: Sat, 6 Jul 2019 18:02:35 -0700
Subject: [PATCH] Updated Funkwhale and TTRSS; building Gitea image from local
 Dockerfile.

---
 funkwhale/docker-compose.yml |  2 +-
 gitea/Dockerfile             | 17 +++++++++++++++++
 gitea/docker-compose.yml     |  3 ++-
 standardfile                 |  2 +-
 ttrss/docker-compose.yml     |  2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 gitea/Dockerfile

diff --git a/funkwhale/docker-compose.yml b/funkwhale/docker-compose.yml
index 4813198..9d0e4f4 100644
--- a/funkwhale/docker-compose.yml
+++ b/funkwhale/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   funkwhale:
-    image: funkwhale/all-in-one:0.18.1
+    image: funkwhale/all-in-one:0.19.0
     container_name: funkwhale
     restart: unless-stopped
     env_file: .env
diff --git a/gitea/Dockerfile b/gitea/Dockerfile
new file mode 100644
index 0000000..3704315
--- /dev/null
+++ b/gitea/Dockerfile
@@ -0,0 +1,17 @@
+FROM gitea/gitea
+
+RUN apk --no-cache add \
+    freetype \
+    freetype-dev \
+    gcc \
+    g++ \
+    libpng \
+    python-dev \
+    py-pip \
+    python3-dev \
+    py3-pip
+
+RUN pip3 install --upgrade pip
+RUN pip3 install -U setuptools
+RUN pip3 install docutils
+
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 817f78d..6fbbf26 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -6,7 +6,8 @@ networks:
         
 services:   
     server:     
-        image: gitea/gitea:latest     
+        build: .
+        image: gitea
         container_name: gitea
         environment:       
             - USER_UID=1000       
diff --git a/standardfile b/standardfile
index 8b5d459..38cd3a6 160000
--- a/standardfile
+++ b/standardfile
@@ -1 +1 @@
-Subproject commit 8b5d459277a715f7057b7ef5d3d406d0fa3c15fb
+Subproject commit 38cd3a6f31d78d1115760ca0905b156082ea3266
diff --git a/ttrss/docker-compose.yml b/ttrss/docker-compose.yml
index bc620ca..8232e64 100644
--- a/ttrss/docker-compose.yml
+++ b/ttrss/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
     ttrss:
-        image: valvin1/docker-ttrss # use x86dev/docker-ttrss once #36 is merged into master
+        image: x86dev/docker-ttrss
         container_name: ttrss
         restart: always
         environment: