Skip to content

Commit

Permalink
change source of image
Browse files Browse the repository at this point in the history
  • Loading branch information
compgeniuses committed Jan 23, 2024
1 parent aa79e08 commit 9df09e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ buildah config --entrypoint=/ \
--label="org.nethserver.authorizations=traefik@node:routeadm" \
--label="org.nethserver.tcp-ports-demand=1" \
--label="org.nethserver.rootfull=0" \
--label="org.nethserver.images=docker.io/postgres:16 docker.io/joplin/server:latest" \
--label="org.nethserver.images=docker.io/postgres:16 ghcr.io/florider89/joplin-server:latest" \
# --label="org.nethserver.images=docker.io/postgres:16 docker.io/joplin/server:latest" \
"${container}"
# Commit the image
buildah commit "${container}" "${repobase}/${reponame}"
Expand Down
3 changes: 2 additions & 1 deletion imageroot/systemd/user/joplin-server.service
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ ExecStart=/usr/bin/podman run \
--env=JOPLIN_DBNAME=${POSTGRES_DATABASE} \
--env=JOPLIN_DBUSER=${POSTGRES_USER} \
--env=JOPLIN_DBPASS=${POSTGRES_PASSWORD} \
${SERVER_IMAGE}
${JOPLIN_SERVER_IMAGE}
# ${SERVER_IMAGE}
ExecStop=/usr/bin/podman stop --ignore --cidfile %t/joplin-server.ctr-id -t 10
ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/joplin-server.ctr-id
PIDFile=%t/joplin-server.pid
Expand Down

0 comments on commit 9df09e3

Please sign in to comment.