From bba1dee6a903811722433b3d0b01722fc134db3d Mon Sep 17 00:00:00 2001 From: Deon George Date: Sun, 11 Mar 2018 11:24:07 +1100 Subject: [PATCH] Minor updates and cleanup --- Dockerfile | 12 ++++++------ init | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7ed834e..bef8ebe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,20 +15,20 @@ COPY install.xml install-fp.xml /tmp/ ## New Install - Base level with License #RUN SOURCE_URL=http://YOUR_SITE_URL_HERE && \ # mkdir -p /tmp/build && cd /tmp/build && \ -# curl -SL ${SOURCE_URL}/8.1.4 > tsm && df && chmod +x tsm && ./tsm && rm -f tsm && df && \ +# curl -SL ${SOURCE_URL}/8.1.4 > tsm && chmod +x tsm && ./tsm && rm -f tsm && \ # ./install.sh -s -input /tmp/install.xml -acceptLicense && \ -# rm -rf /tmp/build +# rm -rf /tmp/build /tmp/install*xml # New Upgrade Install - Need to get license from base level RUN SOURCE_URL=http://YOUR_SITE_URL_HERE && \ mkdir -p /tmp/build/8.1.0 && cd /tmp/build/8.1.0 && \ curl -SL ${SOURCE_URL}/8.1.0 > tsm && chmod +x tsm && ./tsm && rm -f tsm && \ ./install.sh -s -input /tmp/install.xml -acceptLicense && \ - rm -rf /tmp/build/8.1.0 && ls -al /tmp/ && df && \ + rm -rf /tmp/build/8.1.0 && \ mkdir -p /tmp/build/8.1.1 && cd /tmp/build/8.1.1 && \ - curl -SL ${SOURCE_URL}/8.1.1 > tsm && chmod +x tsm && df && ./tsm && df && rm -f tsm && \ - ./install.sh -s -input /tmp/install-fp.xml -acceptLicense && df && \ - rm -rf /tmp/install* /tmp/build/8.1.1 && ls -al /tmp/ && df && find /tmp/ + curl -SL ${SOURCE_URL}/8.1.1 > tsm && chmod +x tsm && ./tsm && rm -f tsm && \ + ./install.sh -s -input /tmp/install-fp.xml -acceptLicense && \ + rm -rf /tmp/build /tmp/install*xml # Dont forget to change the user in the init file too ENV USER=tsm USERDIR=/tsm USERID=201 GROUPID=201 diff --git a/init b/init index 5492368..7d9ff3f 100755 --- a/init +++ b/init @@ -24,9 +24,9 @@ if [ "$1" == "start" ]; then elif [ "$1" == "init1" ]; then [ ! -d /tsm.init -o ! -d /database.init ] && echo "ERROR: /tsm.init or /database.init doesnt exist" && exit 1 - chown ${USER}:servers /database.init /tsm.init cp -a /tsm/.[a-z]* /tsm/* /tsm.init/ - su ${USER} -lc "mkdir /database.init/tsmdb /database.init/activelog /database.init/archlog /database.init/archfaillog /database.init/mirrorlog" + mkdir /database.init/tsmdb /database.init/activelog /database.init/archlog /database.init/archfaillog /database.init/mirrorlog + chown -R ${USER}:servers /database.init /tsm.init # Init two creates our database, and runs our admin marco. elif [ "$1" == "init2" ]; then