Skip to content

Commit c3c3531

Browse files
committed
Switch cli args to envs as per #83
1 parent b2f213d commit c3c3531

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ LABEL maintainer="aptalca"
1313
ARG DEBIAN_FRONTEND="noninteractive"
1414
ENV HOME="/config" \
1515
TMPDIR=/run/duplicati-temp \
16-
DUPLICATI__REQUIRE_DB_ENCRYPTION_KEY=true
16+
DUPLICATI__REQUIRE_DB_ENCRYPTION_KEY=true \
17+
DUPLICATI__SERVER_DATAFOLDER=/config \
18+
DUPLICATI__WEBSERVICE_PORT=8200 \
19+
DUPLICATI__WEBSERVICE_INTERFACE=any \
20+
DUPLICATI__WEBSERVICE_ALLOWED_HOSTNAMES=*
1721

1822
RUN \
1923
echo "**** install packages ****" && \

Dockerfile.aarch64

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ LABEL maintainer="aptalca"
1313
ARG DEBIAN_FRONTEND="noninteractive"
1414
ENV HOME="/config" \
1515
TMPDIR=/run/duplicati-temp \
16-
DUPLICATI__REQUIRE_DB_ENCRYPTION_KEY=true
16+
DUPLICATI__REQUIRE_DB_ENCRYPTION_KEY=true \
17+
DUPLICATI__SERVER_DATAFOLDER=/config \
18+
DUPLICATI__WEBSERVICE_PORT=8200 \
19+
DUPLICATI__WEBSERVICE_INTERFACE=any \
20+
DUPLICATI__WEBSERVICE_ALLOWED_HOSTNAMES=*
1721

1822
RUN \
1923
echo "**** install packages ****" && \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pipeline {
3535
CI_PORT='8200'
3636
CI_SSL='false'
3737
CI_DELAY='120'
38-
CI_DOCKERENV=''
38+
CI_DOCKERENV='SETTINGS_ENCRYPTION_KEY=abcde12345'
3939
CI_AUTH=''
4040
CI_WEBPATH=''
4141
}

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ repo_vars:
2323
- CI_PORT='8200'
2424
- CI_SSL='false'
2525
- CI_DELAY='120'
26-
- CI_DOCKERENV=''
26+
- CI_DOCKERENV='SETTINGS_ENCRYPTION_KEY=abcde12345'
2727
- CI_AUTH=''
2828
- CI_WEBPATH=''

root/etc/s6-overlay/s6-rc.d/svc-duplicati/run

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33

44
exec \
55
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8200" \
6-
cd /app/duplicati s6-setuidgid abc ./duplicati-server \
7-
--webservice-interface=any --server-datafolder=/config --webservice-allowed-hostnames=* $CLI_ARGS
6+
cd /app/duplicati s6-setuidgid abc ./duplicati-server $CLI_ARGS

0 commit comments

Comments
 (0)