Merge pull request #292 from srnyx/patch-1
Apply #262 to Python entrypoint
This commit is contained in:
@@ -12,17 +12,17 @@ export INTERNAL_IP
|
|||||||
cd /home/container || exit 1
|
cd /home/container || exit 1
|
||||||
|
|
||||||
# Print Java version
|
# Print Java version
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0mjava -version\n"
|
printf "\033[1m\033[33mcontainer~ \033[0mjava -version\n"
|
||||||
java -version
|
java -version
|
||||||
|
|
||||||
|
|
||||||
# Print Python version
|
# Print Python version
|
||||||
if command -v python &> /dev/null
|
if command -v python &> /dev/null
|
||||||
then
|
then
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0mpython --version\n"
|
printf "\033[1m\033[33mcontainer~ \033[0mpython --version\n"
|
||||||
python --version
|
python --version
|
||||||
else
|
else
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0mpython3 --version\n"
|
printf "\033[1m\033[33mcontainer~ \033[0mpython3 --version\n"
|
||||||
python3 --version
|
python3 --version
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ fi
|
|||||||
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||||
|
|
||||||
# Display the command we're running in the output, and then execute it with eval
|
# Display the command we're running in the output, and then execute it with eval
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0m"
|
printf "\033[1m\033[33mcontainer~ \033[0m"
|
||||||
echo "$PARSED"
|
echo "$PARSED"
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
eval "$PARSED"
|
eval "$PARSED"
|
||||||
|
@@ -9,7 +9,7 @@ export INTERNAL_IP
|
|||||||
export DOTNET_ROOT=/usr/share/
|
export DOTNET_ROOT=/usr/share/
|
||||||
|
|
||||||
# print the dotnet version on startup
|
# print the dotnet version on startup
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0mdotnet --version\n"
|
printf "\033[1m\033[33mcontainer~ \033[0mdotnet --version\n"
|
||||||
dotnet --version
|
dotnet --version
|
||||||
|
|
||||||
# Replace Startup Variables
|
# Replace Startup Variables
|
||||||
|
@@ -10,7 +10,7 @@ export INTERNAL_IP
|
|||||||
cd /home/container || exit 1
|
cd /home/container || exit 1
|
||||||
|
|
||||||
# Print Erlang's version
|
# Print Erlang's version
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0merl -noshell -eval 'erlang:display(erlang:system_info(system_version))' -eval 'init:stop()'\n"
|
printf "\033[1m\033[33mcontainer~ \033[0merl -noshell -eval 'erlang:display(erlang:system_info(system_version))' -eval 'init:stop()'\n"
|
||||||
erl -noshell -eval 'erlang:display(erlang:system_info(system_version))' -eval 'init:stop()'
|
erl -noshell -eval 'erlang:display(erlang:system_info(system_version))' -eval 'init:stop()'
|
||||||
|
|
||||||
# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
|
# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
|
||||||
@@ -19,7 +19,7 @@ erl -noshell -eval 'erlang:display(erlang:system_info(system_version))' -eval 'i
|
|||||||
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||||
|
|
||||||
# Display the command we're running in the output, and then execute it with eval
|
# Display the command we're running in the output, and then execute it with eval
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0m"
|
printf "\033[1m\033[33mcontainer~ \033[0m"
|
||||||
echo "$PARSED"
|
echo "$PARSED"
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
eval "$PARSED"
|
eval "$PARSED"
|
||||||
|
@@ -12,7 +12,7 @@ export INTERNAL_IP
|
|||||||
cd /home/container || exit 1
|
cd /home/container || exit 1
|
||||||
|
|
||||||
# Print minetest version
|
# Print minetest version
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0mminetest --version\n"
|
printf "\033[1m\033[33mcontainer~ \033[0mminetest --version\n"
|
||||||
minetest --version
|
minetest --version
|
||||||
|
|
||||||
# Replace Startup Variables
|
# Replace Startup Variables
|
||||||
|
@@ -34,7 +34,7 @@ export INTERNAL_IP
|
|||||||
cd /home/container || exit 1
|
cd /home/container || exit 1
|
||||||
|
|
||||||
# Print Go version
|
# Print Go version
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0mgo version\n"
|
printf "\033[1m\033[33mcontainer~ \033[0mgo version\n"
|
||||||
go version
|
go version
|
||||||
|
|
||||||
# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
|
# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
|
||||||
@@ -43,7 +43,7 @@ go version
|
|||||||
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||||
|
|
||||||
# Display the command we're running in the output, and then execute it with eval
|
# Display the command we're running in the output, and then execute it with eval
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0m"
|
printf "\033[1m\033[33mcontainer~ \033[0m"
|
||||||
echo "$PARSED"
|
echo "$PARSED"
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
eval "$PARSED"
|
eval "$PARSED"
|
||||||
|
@@ -34,7 +34,7 @@ export INTERNAL_IP
|
|||||||
cd /home/container || exit 1
|
cd /home/container || exit 1
|
||||||
|
|
||||||
# Print Java version
|
# Print Java version
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0mjava -version\n"
|
printf "\033[1m\033[33mcontainer~ \033[0mjava -version\n"
|
||||||
java -version
|
java -version
|
||||||
|
|
||||||
# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
|
# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
|
||||||
@@ -43,7 +43,7 @@ java -version
|
|||||||
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||||
|
|
||||||
# Display the command we're running in the output, and then execute it with eval
|
# Display the command we're running in the output, and then execute it with eval
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0m"
|
printf "\033[1m\033[33mcontainer~ \033[0m"
|
||||||
echo "$PARSED"
|
echo "$PARSED"
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
eval "$PARSED"
|
eval "$PARSED"
|
||||||
|
@@ -37,7 +37,7 @@ cd /home/container || exit 1
|
|||||||
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||||
|
|
||||||
# Display the command we're running in the output, and then execute it with eval
|
# Display the command we're running in the output, and then execute it with eval
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0m"
|
printf "\033[1m\033[33mcontainer~ \033[0m"
|
||||||
echo "$PARSED"
|
echo "$PARSED"
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
eval "$PARSED"
|
eval "$PARSED"
|
||||||
|
@@ -8,9 +8,13 @@ export INTERNAL_IP
|
|||||||
# Print current Python version
|
# Print current Python version
|
||||||
python --version
|
python --version
|
||||||
|
|
||||||
# Replace Startup Variables
|
# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
|
||||||
MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'))
|
# variable format of "${VARIABLE}" before evaluating the string and automatically
|
||||||
echo -e ":/home/container$ ${MODIFIED_STARTUP}"
|
# replacing the values.
|
||||||
|
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||||
|
|
||||||
# Run the Server
|
# Display the command we're running in the output, and then execute it with eval
|
||||||
eval ${MODIFIED_STARTUP}
|
printf "\033[1m\033[33mcontainer~ \033[0m"
|
||||||
|
echo "$PARSED"
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
eval "$PARSED"
|
||||||
|
@@ -18,7 +18,7 @@ echo "installed youtube-dl Version:"
|
|||||||
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||||
|
|
||||||
# Display the command we're running in the output, and then execute it with eval
|
# Display the command we're running in the output, and then execute it with eval
|
||||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0m"
|
printf "\033[1m\033[33mcontainer~ \033[0m"
|
||||||
echo "$PARSED"
|
echo "$PARSED"
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
eval "$PARSED"
|
eval "$PARSED"
|
||||||
|
Reference in New Issue
Block a user