Compare commits

...

2 Commits

Author SHA1 Message Date
Paolo Asperti b6efb7a160
fix param generation
continuous-integration/drone/tag Build is passing Details
2023-11-09 16:27:05 +01:00
Paolo Asperti e2006e0304
ake shellcheck happy 2023-11-09 16:17:01 +01:00
2 changed files with 32 additions and 21 deletions

View File

@ -2,7 +2,7 @@ FROM alpine:3.15
RUN \
apk upgrade --update --no-cache && \
apk add --update --no-cache nextcloud-client
apk add --update --no-cache nextcloud-client bash
ENV USER_NAME=nextcloudclient
ENV USER_UID=1000
@ -23,4 +23,4 @@ ENV NEXTCLOUD_SLEEP=30
COPY start.sh /start.sh
ENTRYPOINT ["/bin/sh", "/start.sh"]
ENTRYPOINT ["/bin/bash", "/start.sh"]

View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
USER_NAME=${USER_NAME:-nextcloudclient}
USER_GROUP=${USER_GROUP:-nextcloudgroup}
@ -12,21 +12,21 @@ NEXTCLOUD_DIR_CHOWN=${NEXTCLOUD_DIR_CHOWN:-1}
NEXTCLOUD_SLEEP=${NEXTCLOUD_SLEEP:-30}
# check if group already exists
GRP_NAME=$(getent group ${USER_GID} )
GRP_NAME=$(getent group "${USER_GID}" )
if [ "${GRP_NAME}" ] ; then
USER_GROUP=$( echo ${GRP_NAME} | sed 's/\:.*//' )
USER_GROUP=$( echo "${GRP_NAME}" | sed 's/\:.*//' )
else
# if not, we create the group
addgroup -g ${USER_GID} ${USER_GROUP}
addgroup -g "${USER_GID}" "${USER_GROUP}"
fi
# check if user already exists
USR_NAME=$(getent passwd ${USER_UID} )
USR_NAME=$(getent passwd "${USER_UID}" )
if [ "${USR_NAME}" ] ; then
USER_NAME=$( echo ${USR_NAME} | sed 's/\:.*//' )
USER_NAME=$( echo "${USR_NAME}" | sed 's/\:.*//' )
else
# if not, we create the user
adduser -s /bin/false -D -H -G ${USER_GROUP} -u ${USER_UID} ${USER_NAME}
adduser -s /bin/false -D -H -G "${USER_GROUP}" -u "${USER_UID}" "${USER_NAME}"
fi
# create dir if not exists (it should exist if you mapped it outside the container)
@ -36,40 +36,51 @@ fi
# replace data directory permissions
if [ "${NEXTCLOUD_DIR_CHOWN}" = "1" ] ; then
chown -R ${USER_UID}:${USER_GID} "${NEXTCLOUD_DIR}"
chown -R "${USER_UID}":"${USER_GID}" "${NEXTCLOUD_DIR}"
fi
PARAMS=
PARAMS=()
if [ "${NEXTCLOUD_FORCE_TRUST}" = "1" ] ; then
PARAMS="${PARAMS} --trust"
PARAMS+="--trust"
fi
if [ ! "${NEXTCLOUD_HTTPPROXY}" = "" ] ; then
PARAMS="${PARAMS} --httpproxy '${NEXTCLOUD_HTTPPROXY}'"
PARAMS+="--httpproxy"
PARAMS+="${NEXTCLOUD_HTTPPROXY}"
fi
if [ ! "${NEXTCLOUD_UPLIMIT}" = "" ] ; then
PARAMS="${PARAMS} --uplimit '${NEXTCLOUD_UPLIMIT}'"
PARAMS+="--uplimit"
PARAMS+="${NEXTCLOUD_UPLIMIT}"
fi
if [ ! "${NEXTCLOUD_DOWNLIMIT}" = "" ] ; then
PARAMS="${PARAMS} --downlimit '${NEXTCLOUD_DOWNLIMIT}'"
PARAMS+="--downlimit"
PARAMS+="${NEXTCLOUD_DOWNLIMIT}"
fi
if [ ! "${NEXTCLOUD_EXCLUDEFILE}" = "" ] ; then
if [ -r "${NEXTCLOUD_EXCLUDEFILE}" ] ; then
PARAMS="${PARAMS} --exclude '${NEXTCLOUD_EXCLUDEFILE}'"
PARAMS+="--exclude"
PARAMS+="${NEXTCLOUD_EXCLUDEFILE}"
fi
fi
if [ ! "${NEXTCLOUD_UNSYNCFILE}" = "" ] ; then
if [ -r "${NEXTCLOUD_UNSYNCFILE}" ] ; then
PARAMS="${PARAMS} --unsyncedfolders '${NEXTCLOUD_UNSYNCFILE}'"
PARAMS+="--unsyncedfolders"
PARAMS+="'${NEXTCLOUD_UNSYNCFILE}'"
fi
fi
if [ "${NEXTCLOUD_SILENT}" = "1" ] ; then
PARAMS="${PARAMS} --silent"
PARAMS+="--silent"
fi
PARAMS="${PARAMS} --non-interactive -u ${NEXTCLOUD_USERNAME} -p ${NEXTCLOUD_PASSWORD} ${NEXTCLOUD_DIR} ${NEXTCLOUD_URL}"
PARAMS+="--non-interactive"
PARAMS+="-u"
PARAMS+="${NEXTCLOUD_USERNAME}"
PARAMS+="-p"
PARAMS+="${NEXTCLOUD_PASSWORD}"
PARAMS+="${NEXTCLOUD_DIR}"
PARAMS+="${NEXTCLOUD_URL}"
# main loop
while true; do
/bin/su -s /bin/sh ${USER_NAME} -c "/usr/bin/nextcloudcmd ${PARAMS}"
sleep ${NEXTCLOUD_SLEEP}
/bin/su -s /bin/sh "${USER_NAME}" -c "/usr/bin/nextcloudcmd ${PARAMS[@]}"
sleep "${NEXTCLOUD_SLEEP}"
done