diff --git a/bin/build-docker.sh b/bin/build-docker.sh index 9d614eb2b..c2e921169 100755 --- a/bin/build-docker.sh +++ b/bin/build-docker.sh @@ -10,7 +10,7 @@ cat package.json | grep -v electron > server-package.json echo "Compiling typescript..." npx tsc -sudo docker build -t zadam/trilium:$VERSION --network host -t zadam/trilium:$SERIES . +sudo docker build -t triliumnext/notes:$VERSION --network host -t zadam/trilium:$SERIES . if [[ $VERSION != *"beta"* ]]; then sudo docker tag zadam/trilium:$VERSION zadam/trilium:latest diff --git a/docker-compose.yml b/docker-compose.yml index 6798574ac..d6f5a3c65 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,16 +1,21 @@ # Running `docker-compose up` will create/use the "trilium-data" directory in the user home # Run `TRILIUM_DATA_DIR=/path/of/your/choice docker-compose up` to set a different directory -version: '2.1' +# To run in the background, use `docker-compose up -d` services: trilium: - image: zadam/trilium - restart: always + # Optionally, replace `latest` with a version tag like `v0.90.3` + # Using `latest` may cause unintended updates to the container + image: triliumnext/notes:latest + # Restart the container unless it was stopped by the user + restart: unless-stopped environment: - TRILIUM_DATA_DIR=/home/node/trilium-data ports: - - "8080:8080" + # By default, Trilium will be available at http://localhost:8080 + # It will also be accessible at http://:8080 + # You might want to limit this with something like Docker Networks, reverse proxies, or firewall rules, such as UFW + - '8080:8080' volumes: + # Unless TRILIUM_DATA_DIR is set, the data will be stored in the "trilium-data" directory in the home directory. + # This can also be changed with by replacing the line below with `- /path/of/your/choice:/home/node/trilium-data - ${TRILIUM_DATA_DIR:-~/trilium-data}:/home/node/trilium-data - -volumes: - trilium: