Page MenuHomeMusing Studio
Files F10384656

No OneTemporary
Actions

View Options

diff --git a/docker-compose.yml b/docker-compose.yml
index 652ce57..0e43ef0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,47 +1,45 @@
version: "3"
volumes:
web-keys:
db-data:
+ config.ini:
+ external: true
networks:
- external_writefreely:
- internal_writefreely:
+ external_writefreely: # Used to expose WriteFreely to a reverse proxy for example
+ internal_writefreely: # Used for WriteFreely to communicate with the database
internal: true
services:
writefreely-web:
container_name: "writefreely-web"
- image: "writeas/writefreely:latest"
-
+ image: "docker.io/writeas/writefreely:latest"
volumes:
- - "web-keys:/go/keys"
- - "./config.ini:/go/config.ini"
-
+ - "web-keys:/go/keys:z"
+ - "./config.ini:/go/config.ini:Z"
networks:
- "internal_writefreely"
- "external_writefreely"
-
ports:
- "8080:8080"
-
depends_on:
- "writefreely-db"
-
restart: unless-stopped
writefreely-db:
container_name: "writefreely-db"
- image: "mariadb:latest"
-
+ image: "docker.io/mariadb:latest"
volumes:
- - "db-data:/var/lib/mysql/data"
-
+ - "db-data:/var/lib/mysql/data:z"
networks:
- "internal_writefreely"
-
environment:
- - MYSQL_DATABASE=writefreely
- - MYSQL_ROOT_PASSWORD=changeme
-
+ - MYSQL_RANDOM_ROOT_PASSWORD=true
+ - MYSQL_DATABASE=writefreelydb
+ - MYSQL_USER=writefreely
+ - MYSQL_PASSWORD=changeme
+ # MYSQL_HOST points to itself, which matches the container name
+ # "writefreely-db" for container DNS resolution
+ - MYSQL_HOST=localhost
restart: unless-stopped
diff --git a/docker-setup.sh b/docker-setup.sh
deleted file mode 100755
index 46f41f3..0000000
--- a/docker-setup.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-docker-compose exec db sh -c 'exec mysql -u root -pchangeme writefreely < /tmp/schema.sql'
-docker exec writefreely_web_1 writefreely --gen-keys
-docker exec -it writefreely_web_1 writefreely --config
\ No newline at end of file

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 23, 5:45 PM (20 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3104797

Event Timeline

musing studio · developers