Skip to content

Commit

Permalink
Revert changes that were not meant to be merged into ryansheehan's up…
Browse files Browse the repository at this point in the history
…stream
  • Loading branch information
loganintech committed Dec 31, 2023
1 parent 361f676 commit ce45c75
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 2 additions & 0 deletions tshock/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ RUN apt-get update -y && \

# copy game files
COPY --from=base /tshock/ /tshock/
# Copy the plugin files to a place that bootstrap can copy them to the plugins folder at runtime
COPY --from=base /tshock/ServerPlugins/ /plugins

# Set working directory to server
WORKDIR /tshock
Expand Down
9 changes: 7 additions & 2 deletions tshock/bootstrap.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
#!/bin/bash

echo "\nBootstrap:\nworld_file_name=$WORLD_FILENAME\nconfigpath=$CONFIGPATH\nlogpath=$LOGPATH\n"
echo "Copying plugins..."
cp -Rfv /plugins/* ./ServerPlugins

# Copy plugins if the folder is empty (like on first run)
if [ -z "$(ls -A /tshock/ServerPlugins)" ]; then
echo "Copying plugins..."
cp /plugins/* /tshock/ServerPlugins
fi


if [ $(jq -r '.Settings.StorageType' $CONFIGPATH/config.json) = "mysql" ]; then
DATABASE_SERVER=$(jq -r '.Settings.MySqlHost' $CONFIGPATH/config.json | cut -f1 -d':')
Expand Down

0 comments on commit ce45c75

Please sign in to comment.