deon/spdocker
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor updates and cleanup

Browse Source
This commit is contained in:
Deon George 2018-03-11 11:24:07 +11:00
parent 5deabda8f4
commit bba1dee6a9
No known key found for this signature in database
GPG Key ID: 7670E8DC27415254
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -15,20 +15,20 @@ COPY install.xml install-fp.xml /tmp/
## New Install - Base level with License ## New Install - Base level with License
#RUN SOURCE_URL=http://YOUR_SITE_URL_HERE && \ #RUN SOURCE_URL=http://YOUR_SITE_URL_HERE && \
# mkdir -p /tmp/build && cd /tmp/build && \ # 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 && \ # ./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 # New Upgrade Install - Need to get license from base level
RUN SOURCE_URL=http://YOUR_SITE_URL_HERE && \ RUN SOURCE_URL=http://YOUR_SITE_URL_HERE && \
mkdir -p /tmp/build/8.1.0 && cd /tmp/build/8.1.0 && \ 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 && \ curl -SL ${SOURCE_URL}/8.1.0 > tsm && chmod +x tsm && ./tsm && rm -f tsm && \
./install.sh -s -input /tmp/install.xml -acceptLicense && \ ./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 && \ 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 && \ curl -SL ${SOURCE_URL}/8.1.1 > tsm && chmod +x tsm && ./tsm && rm -f tsm && \
./install.sh -s -input /tmp/install-fp.xml -acceptLicense && df && \ ./install.sh -s -input /tmp/install-fp.xml -acceptLicense && \
rm -rf /tmp/install* /tmp/build/8.1.1 && ls -al /tmp/ && df && find /tmp/ rm -rf /tmp/build /tmp/install*xml
# Dont forget to change the user in the init file too # Dont forget to change the user in the init file too
ENV USER=tsm USERDIR=/tsm USERID=201 GROUPID=201 ENV USER=tsm USERDIR=/tsm USERID=201 GROUPID=201

4
init
View File

@ -24,9 +24,9 @@ if [ "$1" == "start" ]; then
elif [ "$1" == "init1" ]; then elif [ "$1" == "init1" ]; then
[ ! -d /tsm.init -o ! -d /database.init ] && echo "ERROR: /tsm.init or /database.init doesnt exist" && exit 1 [ ! -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/ 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. # Init two creates our database, and runs our admin marco.
elif [ "$1" == "init2" ]; then elif [ "$1" == "init2" ]; then