Skip to content

Commit

Permalink
Include install.sh, run.sh into the docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
ysdragon committed Aug 21, 2024
1 parent 1a8c3ca commit 6952a86
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
6 changes: 3 additions & 3 deletions egg-vps.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "PTDL_v2",
"update_url": null
},
"exported_at": "2024-05-05T11:45:57+03:00",
"exported_at": "2024-08-21T09:48:24+03:00",
"name": "VPS - Egg",
"author": "[email protected]",
"description": "Run a VPS in pterodactyl!",
Expand All @@ -13,10 +13,10 @@
"quay.io\/ydrag0n\/pterodactyl-vps-egg": "quay.io\/ydrag0n\/pterodactyl-vps-egg"
},
"file_denylist": [],
"startup": "bash install.sh",
"startup": "bash \/run.sh",
"config": {
"files": "{\r\n \"vps.config\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"internalip\": \"0.0.0.0\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"port2\": \"{{server.build.env.port2}}\",\r\n \"port3\": \"{{server.build.env.PORT3}}\",\r\n \"port4\": \"{{server.build.env.port3}}\",\r\n \"port5\": \"{{server.build.env.port5}}\",\r\n \"port6\": \"{{server.build.env.port6}}\",\r\n \"port7\": \"{{server.build.env.port7}}\",\r\n \"port8\": \"{{server.build.env.port8}}\",\r\n \"port9\": \"{{server.build.env.port9}}\",\r\n \"port10\": \"{{server.build.env.port10}}\",\r\n \"port11\": \"{{server.build.env.port11}}\",\r\n \"port12\": \"{{server.build.env.port12}}\",\r\n \"port13\": \"{{server.build.env.port13}}\",\r\n \"port14\": \"{{server.build.env.port14}}\",\r\n \"port15\": \"{{server.build.env.port15}}\",\r\n \"port16\": \"{{server.build.env.port16}}\",\r\n \"port17\": \"{{server.build.env.port17}}\",\r\n \"port18\": \"{{server.build.env.port18}}\",\r\n \"port19\": \"{{server.build.env.port19}}\",\r\n \"port20\": \"{{server.build.env.port20}}\"\r\n }\r\n }\r\n}",
"startup": "{\r\n \"done\": \"root@MyVPS:~#\",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}",
"startup": "{\r\n \"done\": \"Starting\"\r\n}",
"logs": "{}",
"stop": "exit"
},
Expand Down
5 changes: 2 additions & 3 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'

# Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
curl -Ls https://raw.githubusercontent.com/ysdragon/Pterodactyl-VPS-Egg/main/install.sh -o install.sh
chmod +x ./install.sh

# Run the VPS Installer
sh ./install.sh
sh /install.sh
9 changes: 5 additions & 4 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -366,10 +366,11 @@ fi
# Package Installation & Setup #
#################################

# Download run.sh
curl -Ls "https://raw.githubusercontent.com/ysdragon/Pterodactyl-VPS-Egg/main/run.sh" -o "$ROOTFS_DIR/home/container/run.sh"
# Copy run.sh
cp /run.sh "$ROOTFS_DIR/run.sh"

# Make run.sh executable.
chmod +x "$ROOTFS_DIR/home/container/run.sh"
chmod +x "$ROOTFS_DIR/run.sh"

# Download static proot.
if [ ! -e "$ROOTFS_DIR/.installed" ]; then
Expand Down Expand Up @@ -409,4 +410,4 @@ done < "$ROOTFS_DIR/vps.config"
"$ROOTFS_DIR/usr/local/bin/proot" \
--rootfs="${ROOTFS_DIR}" \
-0 -w "/root" -b /dev -b /sys -b /proc -b /etc/resolv.conf $port_args --kill-on-exit \
/bin/sh "$ROOTFS_DIR/run.sh"
/bin/sh "/run.sh"
4 changes: 4 additions & 0 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ RED='\033[0;31m'
GREEN='\033[0;32m'
NC='\033[0m'

printf "\033c"
printf "${GREEN}Starting..${NC}\n"
printf "\033c"

DIR=$PWD # get current dir
# if current dir is /root print ~
if [ "$PWD" = "/root"* ]; then
Expand Down

0 comments on commit 6952a86

Please sign in to comment.