Skip to content

Commit a53acf9

Browse files
authored
EDT Cloud fixes (#34) solves #33
* fix: use custom built ssb-room * fix: add missing volumes to filebrowser * fix: comment out ssb-room as go.cryptoscope.co/netwrap is offline * chore: cloud cleanup and fully remove ssb * fix: add missing folder to filebrowser volumes and remove old command from docker-compose
1 parent 3dde128 commit a53acf9

File tree

5 files changed

+8
-78
lines changed

5 files changed

+8
-78
lines changed

docker/cloud/.env.example

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ DOMAIN_CRAWLER=crawl.earthdefenderstoolkit.com
1010
DOMAIN_FDROID=repo.earthdefenderstoolkit.com
1111
# FILE BROWSER
1212
DOMAIN_FILEBROWSER=files.earthdefenderstoolkit.com
13-
# SSB-ROOM
14-
ROOM_MODE=restricted
15-
ROOM_ADMIN="@2RNGJafZtMHzd76gyvqH6EJiK7kBnXeak5mBWzoO/iU=.ed25519"
16-
DOMAIN_ROOM=ssb.earthdefenderstoolkit.com
1713
# MINIO
1814
DOMAIN_MINIO=minio.earthdefenderstoolkit.com
1915
ADMIN_MINIO=admin

docker/cloud/docker-compose.yml

+8-32
Original file line numberDiff line numberDiff line change
@@ -59,44 +59,20 @@ services:
5959
VIRTUAL_HOST: ${DOMAIN_FDROID}
6060
LETSENCRYPT_HOST: ${DOMAIN_FDROID}
6161
LETSENCRYPT_EMAIL: ${EMAIL}
62+
# https://filebrowser.org
6263
filebrowser:
6364
image: filebrowser/filebrowser:s6
6465
restart: always
6566
volumes:
6667
- ${DIR}:/srv
68+
- ${DIR}/app-data/filebrowser/database:/database
69+
- ${DIR}/app-data/filebrowser/config:/config
6770
environment:
6871
VIRTUAL_HOST: ${DOMAIN_FILEBROWSER}
6972
LETSENCRYPT_HOST: ${DOMAIN_FILEBROWSER}
7073
LETSENCRYPT_EMAIL: ${EMAIL}
71-
PGID: 1000
72-
PUID: 1000
73-
command: -- c
74-
# https://hub.docker.com/r/cooldracula/go-ssb-room
75-
ssb-room:
76-
image: cooldracula/go-ssb-room
77-
restart: always
78-
ports:
79-
- "0.0.0.0:8007:8008" # This is the port SSB clients connect to
80-
volumes:
81-
- ${DIR}/app-data/ssb-room:/ssb-go-room
82-
environment:
83-
VIRTUAL_HOST: ${DOMAIN_ROOM}
84-
LETSENCRYPT_HOST: ${DOMAIN_ROOM}
85-
LETSENCRYPT_EMAIL: ${EMAIL}
86-
VIRTUAL_PORT: 3000
87-
SSB_ROOM_MODE: ${ROOM_MODE}
88-
SSB_ROOM_ADMIN_KEY: ${ROOM_ADMIN}
89-
SSB_ROOM_DOMAIN: ${DOMAIN_ROOM}
90-
# https://hub.docker.com/repository/docker/communityfirst/ssb-go-pub
91-
# ssb-pub:
92-
# image: communityfirst/ssb-go-pub:latest
93-
# ports:
94-
# - "0.0.0.0:8008:8008" # This is the port SSB clients connect to
95-
# environment:
96-
# ROOM: ${SSB_ROOM}
97-
# volumes:
98-
# - ${DIR}/app-data/ssb-pub:/root/.ssb-go'
99-
# restart: unless-stopped
74+
PGID: ${PGID}
75+
PUID: ${PUID}
10076
# https://hub.docker.com/r/minio/minio/
10177
minio:
10278
image: minio/minio
@@ -122,8 +98,8 @@ services:
12298
image: lscr.io/linuxserver/syncthing
12399
restart: always
124100
environment:
125-
PUID: 1000
126-
PGID: 1000
101+
PUID: ${PUID}
102+
PGID: ${PGID}
127103
VIRTUAL_HOST: ${DOMAIN_SYNCTHING}
128104
LETSENCRYPT_HOST: ${DOMAIN_SYNCTHING}
129105
LETSENCRYPT_EMAIL: ${EMAIL}
@@ -148,5 +124,5 @@ services:
148124
LETSENCRYPT_EMAIL: ${EMAIL}
149125
VIRTUAL_PORT: 8080
150126
CRAWL_TIMER: ${CRAWL_TIMER}
151-
# TODO: Terrastories, Portal
127+
# TODO: Terrastories
152128
# V2: Open Balena

docker/local/docker-compose.yml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ volumes:
77
crawls:
88
pywb-archive:
99
minio-data:
10-
ssb-data:
1110
installers:
1211
mapeo-bridge:
1312
# Terrastories

services/ssb-room/Dockerfile

-34
This file was deleted.

services/ssb-room/run.sh

-7
This file was deleted.

0 commit comments

Comments
 (0)