personalized
Some checks failed
Build Docker containers / Build and push client/ Docker container (push) Has been cancelled
Build Docker containers / Build and push server/ Docker container (push) Has been cancelled
Run unit tests / Run pytest for server/ (push) Has been cancelled

This commit is contained in:
Ulysia 2025-01-13 21:14:55 +01:00
parent 61b9f81e39
commit 5ef62b21a0
4 changed files with 9 additions and 4 deletions

3
.gitignore vendored
View file

@ -13,3 +13,6 @@ server/**/lib/
server/**/bin/ server/**/bin/
server/**/pyvenv.cfg server/**/pyvenv.cfg
__pycache__/ __pycache__/
data/
sql/

View file

@ -61,4 +61,4 @@ $safety-sketchy = #F3D75F
$safety-unsafe = #F3985F $safety-unsafe = #F3985F
$scrollbar-thumb-color = $main-color $scrollbar-thumb-color = $main-color
$scrollbar-bg-color = $input-enabled-background-color $scrollbar-bg-color = $input-enabled-background-color
$transparency-grid-square-color = #F0F0F0 $transparency-grid-square-color = #00000000

View file

@ -7,7 +7,8 @@ version: '2'
services: services:
server: server:
image: szurubooru/server:latest # image: szurubooru/server:latest
build: server
depends_on: depends_on:
- sql - sql
environment: environment:
@ -27,7 +28,8 @@ services:
- "./server/config.yaml:/opt/app/config.yaml" - "./server/config.yaml:/opt/app/config.yaml"
client: client:
image: szurubooru/client:latest # image: szurubooru/client:latest
build: client
depends_on: depends_on:
- server - server
environment: environment:

View file

@ -99,7 +99,7 @@ class Image:
"-f", "-f",
"lavfi", "lavfi",
"-i", "-i",
"color=white:s=%dx%d" % (self.width, self.height), "color=black:s=%dx%d" % (self.width, self.height),
"-i", "-i",
"{path}", "{path}",
"-f", "-f",