container/docker-perkeep
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature: move perkeep template configuration out of config folder
All checks were successful
Main / build (push) Successful in 29m22s
Details

Browse Source
This commit is contained in:
RouxAntoine 2023-12-25 23:50:36 +01:00
parent 97cfc59bb6
commit cda632115d
Signed by: antoine
GPG Key ID: 098FB66FC0475E70
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -41,7 +41,7 @@ RUN mkdir /perkeep/data && \
mkdir /perkeep/config mkdir /perkeep/config
COPY --chown=$USER:$GROUP --chmod=750 --from=builder /go/bin/* /usr/local/bin/ COPY --chown=$USER:$GROUP --chmod=750 --from=builder /go/bin/* /usr/local/bin/
COPY --chown=$USER:$GROUP --chmod=750 server-config.tpl.json /perkeep/config/server-config-custom.tpl.json COPY --chown=$USER:$GROUP --chmod=750 server-config.tpl.json /perkeep/server-config-custom.tpl.json
COPY --chown=$USER:$GROUP --chmod=750 docker-entrypoint.sh /docker-entrypoint.sh COPY --chown=$USER:$GROUP --chmod=750 docker-entrypoint.sh /docker-entrypoint.sh
VOLUME /perkeep/data VOLUME /perkeep/data

4
docker-entrypoint.sh
View File

@ -8,7 +8,7 @@ fi
if [ "T$SECRING" != "T" ] && [ "T$IDENTITY" != "T" ]; if [ "T$SECRING" != "T" ] && [ "T$IDENTITY" != "T" ];
then then
echo "$SECRING" > /perkeep/config/identity-secring.gpg echo "$SECRING" > /perkeep/config/identity-secring.gpg
envsubst < /perkeep/config/server-config-custom.tpl.json > /perkeep/config/server-config-custom.json envsubst < /perkeep/server-config-custom.tpl.json > /perkeep/config/server-config-custom.json
fi fi
if [ ! -f /perkeep/config/identity-secring.gpg ]; if [ ! -f /perkeep/config/identity-secring.gpg ];
@ -16,7 +16,7 @@ then
pk put init -newkey pk put init -newkey
mv perkeep/.config/perkeep/identity-secring.gpg /perkeep/config/ mv perkeep/.config/perkeep/identity-secring.gpg /perkeep/config/
export IDENTITY=$(sed -n -e '/identity/ s/.*:.*"\(.*\)".*/\1/p' /perkeep/.config/perkeep/client-config.json | tee /dev/tty) export IDENTITY=$(sed -n -e '/identity/ s/.*:.*"\(.*\)".*/\1/p' /perkeep/.config/perkeep/client-config.json | tee /dev/tty)
envsubst < /perkeep/config/server-config-custom.tpl.json > /perkeep/config/server-config-custom.json envsubst < /perkeep/server-config-custom.tpl.json > /perkeep/config/server-config-custom.json
rm -r /perkeep/.config rm -r /perkeep/.config
fi fi