Compare commits

..

No commits in common. "7812c5f6e61536391ec7be64da62b01bd6af8058" and "0729a4454b22ebd37dee6904f3f1284d29083e23" have entirely different histories.

2 changed files with 9 additions and 17 deletions

View File

@ -44,7 +44,7 @@ RUN mkdir /app/cronicle && \
cd /app/cronicle && \ cd /app/cronicle && \
wget https://github.com/cronicle-edge/cronicle-edge/archive/refs/tags/v${CRONICLE_EDGE_VERSION}.tar.gz && \ wget https://github.com/cronicle-edge/cronicle-edge/archive/refs/tags/v${CRONICLE_EDGE_VERSION}.tar.gz && \
tar -xf v${CRONICLE_EDGE_VERSION}.tar.gz --strip-components 1 && \ tar -xf v${CRONICLE_EDGE_VERSION}.tar.gz --strip-components 1 && \
rm -rf Docker* .gitignore Readme.md .vscode sample_conf/examples/backup sample_conf/examples/docker.sh && \ rm -rf Docker* .gitignore Readme.md .vscode && \
rm -rf v${CRONICLE_EDGE_VERSION}.tar.gz rm -rf v${CRONICLE_EDGE_VERSION}.tar.gz
WORKDIR /app/cronicle WORKDIR /app/cronicle

View File

@ -98,34 +98,26 @@ then
echo "Cronicle is running in 'worker' mode." echo "Cronicle is running in 'worker' mode."
#Copying config directory to /config/cronicle/conf if not already there, then linking back into Cronicle
if [ ! -f /config/cronicle/conf/config.json ] if [ ! -f /config/cronicle/conf/config.json ]
then then
echo "No config found. Copy config.json from the manager server and place it in /config/cronicle/conf dir." echo "No config found. Copy config.json from the manager server and place it in /config/cronicle/conf dir."
cp -r /app/cronicle/conf /config/cronicle/conf echo "Don't forget to also copy the SSL certs if you're using SSL."
rm -rf /config/cronicle/conf/config.json
rm -rf /app/cronicle/conf mkdir -p /config/cronicle/conf
ln -s /config/cronicle/conf /app/cronicle/conf exit 0
echo ''
echo ''
echo '*************************************'
exit 1
else else
echo "Config is present." #Removing default config.json and linking provided one back into Cronicle
echo "Linking persistent config dir back into Cronicle." rm -rf /app/cronicle/conf/config.json
ln -s /config/cronicle/conf/config.json /app/cronicle/conf/config.json
rm -rf /app/cronicle/conf
ln -s /config/cronicle/conf /app/cronicle/conf
fi fi
else else
echo "'$MODE' is not a recognised appion for the MODE environment variable. Accepted options are 'manager' and 'worker'." echo "'$MODE' is not a recognised appion for the MODE environment variable. Accepted appions are 'manager' and 'worker'."
exit 1
fi fi