Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker-compose.yaml #1038

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 32 additions & 30 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,45 @@
# Edit it to fit your current development needs.
services:
shiori:
build:
context: .
dockerfile: Dockerfile.compose
image: ghcr.io/go-shiori/shiori
noticons marked this conversation as resolved.
Show resolved Hide resolved
container_name: shiori
command:
- "server"
- "--log-level"
- "debug"
ports:
- "8080:8080"
- "8080:8080" #set port number if it needs to be different
noticons marked this conversation as resolved.
Show resolved Hide resolved
volumes:
- "./dev-data:/srv/shiori"
- ".:/src/shiori"
- "go-mod-cache:/go/pkg/mod"
restart: unless-stopped
links:
depends_on:
- "postgres"
- "mariadb"
environment:
SHIORI_DIR: /srv/shiori
# SHIORI_HTTP_ROOT_PATH: /shiori/
# SHIORI_DATABASE_URL: mysql://shiori:shiori@(mariadb)/shiori?charset=utf8mb4
# SHIORI_DATABASE_URL: postgres://shiori:shiori@postgres/shiori?sslmode=disable

nginx:
image: nginx:alpine
ports:
- "8081:8081"
volumes:
- "./testdata/nginx.conf:/etc/nginx/nginx.conf:ro"
depends_on:
- shiori

#SHIORI_DATABASE_URL: mysql://shiori:shiori@(mariadb)/shiori?charset=utf8mb4
SHIORI_DATABASE_URL: postgres://shiori:shiori@postgres/shiori?sslmode=disable
networks:
shiori:
#nginx:
# image: nginx:alpine
# ports:
# - "8081:8081"
# volumes:
# - "./testdata/nginx.conf:/etc/nginx/nginx.conf:ro"
# depends_on:
# - shiori
postgres:
image: postgres:13.18
environment:
POSTGRES_PASSWORD: shiori
POSTGRES_USER: shiori
ports:
- "5432:5432"

- 5432
noticons marked this conversation as resolved.
Show resolved Hide resolved
networks:
shiori:
mariadb:
image: mariadb:10.5.27
environment:
Expand All @@ -51,17 +49,21 @@ services:
MYSQL_USER: shiori
MYSQL_PASSWORD: shiori
ports:
- "3306:3306"
- 3306
noticons marked this conversation as resolved.
Show resolved Hide resolved
networks:
shiori:

mysql:
image: mysql:8.0.40
environment:
MYSQL_ROOT_PASSWORD: toor
MYSQL_DATABASE: shiori
MYSQL_USER: shiori
MYSQL_PASSWORD: shiori
ports:
- "3307:3306"
#mysql:
# image: mysql:8.0.40
# environment:
# MYSQL_ROOT_PASSWORD: toor
# MYSQL_DATABASE: shiori
# MYSQL_USER: shiori
# MYSQL_PASSWORD: shiori
# ports:
# - 3306

volumes:
go-mod-cache:
networks:
shiori: