diff --git a/joplin/compose.yml b/joplin/compose.yml index 4287ca8..770b648 100644 --- a/joplin/compose.yml +++ b/joplin/compose.yml @@ -1 +1,19 @@ -# \ No newline at end of file +#run:: docker compose -p joplin --env-file ./joplin/env.cfg -f ./joplin/compose.yml up -d + +services: + app: + image: ${IMAGE_TAG} + container_name: joplin-server + restart: unless-stopped + ports: + - 22300:22300 + environment: + - APP_PORT=22300 + - APP_BASE_URL=${APP_BASE_URL} + - DB_CLIENT=pg + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_DATABASE=${POSTGRES_DATABASE} + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PORT=${POSTGRES_PORT} + - POSTGRES_HOST=${POSTGRES_HOST} + - TZ=Asia/Shanghai \ No newline at end of file diff --git a/joplin/env.cfg b/joplin/env.cfg new file mode 100644 index 0000000..9341579 --- /dev/null +++ b/joplin/env.cfg @@ -0,0 +1,10 @@ +#IMAGE_TAG=etechonomy/joplin-server:2.14.2 +IMAGE_TAG=florider89/joplin-server:2.14.2 +# only amd64 +#IMAGE_TAG=joplin/server:2.14.2-beta +APP_BASE_URL=http://10.10.13.233:22300 +POSTGRES_USER=postgres +POSTGRES_PASSWORD=Kevin0412PgSql +POSTGRES_DATABASE=joplin-db +POSTGRES_PORT=5432 +POSTGRES_HOST=10.10.13.233 \ No newline at end of file