Updated Funkwhale and TTRSS; building Gitea image from local Dockerfile.
This commit is contained in:
parent
0bb46466a9
commit
fad3b662da
|
@ -2,7 +2,7 @@ version: "3"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
funkwhale:
|
funkwhale:
|
||||||
image: funkwhale/all-in-one:0.18.1
|
image: funkwhale/all-in-one:0.19.0
|
||||||
container_name: funkwhale
|
container_name: funkwhale
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
env_file: .env
|
env_file: .env
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -6,7 +6,8 @@ networks:
|
||||||
|
|
||||||
services:
|
services:
|
||||||
server:
|
server:
|
||||||
image: gitea/gitea:latest
|
build: .
|
||||||
|
image: gitea
|
||||||
container_name: gitea
|
container_name: gitea
|
||||||
environment:
|
environment:
|
||||||
- USER_UID=1000
|
- USER_UID=1000
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 8b5d459277a715f7057b7ef5d3d406d0fa3c15fb
|
Subproject commit 38cd3a6f31d78d1115760ca0905b156082ea3266
|
|
@ -2,7 +2,7 @@ version: "3"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
ttrss:
|
ttrss:
|
||||||
image: valvin1/docker-ttrss # use x86dev/docker-ttrss once #36 is merged into master
|
image: x86dev/docker-ttrss
|
||||||
container_name: ttrss
|
container_name: ttrss
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
|
|
Loading…
Reference in New Issue