devbeni/yolks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: invalid INTERNAL_IP environment value

Browse Source 
New IP route output appends UID to the result, causing the value to be set to that instead of the IP. Fix it by ignoring the last two appended UID results
This commit is contained in:
Alex
2022-04-24 18:10:20 +03:00
parent 9f02fe140f
commit cd6b949868
25 changed files with 70 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bot/bastion/entrypoint.sh
View File

@@ -1,8 +1,9 @@
#!/bin/bash #!/bin/bash
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Set environment variable that holds the Internal Docker IP
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')) MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'))

5
bot/parkertron/entrypoint.sh
View File

@@ -1,8 +1,9 @@
#!/bin/ash #!/bin/ash
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Set environment variable that holds the Internal Docker IP
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`

5
bot/red/entrypoint.sh
View File

@@ -1,8 +1,9 @@
#!/bin/bash #!/bin/bash
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Set environment variable that holds the Internal Docker IP
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')) MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'))

5
bot/sinusbot/entrypoint.sh
View File

@@ -1,8 +1,9 @@
#!/bin/bash #!/bin/bash
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Set environment variable that holds the Internal Docker IP
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`

2
cassandra/entrypoint.sh
View File

@@ -5,7 +5,7 @@ TZ=${TZ:-UTC}
export TZ export TZ
# Set environment variable that holds the Internal Docker IP # Set environment variable that holds the Internal Docker IP
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP export INTERNAL_IP
# Switch to the container's working directory # Switch to the container's working directory

5
dotnet/entrypoint.sh
View File

@@ -1,8 +1,9 @@
#!/bin/bash #!/bin/bash
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Set environment variable that holds the Internal Docker IP
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')

2
erlang/entrypoint.sh
View File

@@ -3,7 +3,7 @@ TZ=${TZ:-UTC}
export TZ export TZ
# Set environment variable that holds the Internal Docker IP # Set environment variable that holds the Internal Docker IP
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP export INTERNAL_IP
# Switch to the container's working directory # Switch to the container's working directory

5
games/altv/entrypoint.sh
View File

@@ -1,8 +1,9 @@
#!/bin/bash #!/bin/bash
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Set environment variable that holds the Internal Docker IP
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')

5
games/arma3/entrypoint.sh
View File

@@ -166,6 +166,11 @@ function RemoveDuplicates { #[Input: str - Output: printf of new str]
} }
# === ENTRYPOINT START === # === ENTRYPOINT START ===
# Set environment variable that holds the Internal Docker IP
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
cd /home/container cd /home/container
sleep 1 sleep 1

2
games/source/entrypoint.sh
View File

@@ -30,7 +30,7 @@ TZ=${TZ:-UTC}
export TZ export TZ
# Set environment variable that holds the Internal Docker IP # Set environment variable that holds the Internal Docker IP
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP export INTERNAL_IP
# Switch to the container's working directory # Switch to the container's working directory

2
go/entrypoint.sh
View File

@@ -27,7 +27,7 @@ TZ=${TZ:-UTC}
export TZ export TZ
# Set environment variable that holds the Internal Docker IP # Set environment variable that holds the Internal Docker IP
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP export INTERNAL_IP
# Switch to the container's working directory # Switch to the container's working directory

2
java/entrypoint.sh
View File

@@ -27,7 +27,7 @@ TZ=${TZ:-UTC}
export TZ export TZ
# Set environment variable that holds the Internal Docker IP # Set environment variable that holds the Internal Docker IP
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP export INTERNAL_IP
# Switch to the container's working directory # Switch to the container's working directory

3
mariadb/entrypoint.sh
View File

@@ -2,7 +2,8 @@
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')

3
mongodb/entrypoint.sh
View File

@@ -2,7 +2,8 @@
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')

3
mono/entrypoint.sh
View File

@@ -2,7 +2,8 @@
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP="eval $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')" MODIFIED_STARTUP="eval $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')"

3
nodejs/entrypoint.sh
View File

@@ -2,7 +2,8 @@
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Print Node.js Version # Print Node.js Version
node -v node -v

2
oses/alpine/entrypoint.sh
View File

@@ -25,7 +25,7 @@ TZ=${TZ:-UTC}
export TZ export TZ
# Set environment variable that holds the Internal Docker IP # Set environment variable that holds the Internal Docker IP
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP export INTERNAL_IP
# Switch to the container's working directory # Switch to the container's working directory

3
oses/debian/entrypoint.sh
View File

@@ -2,7 +2,8 @@
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')

3
oses/ubuntu/entrypoint.sh
View File

@@ -2,7 +2,8 @@
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')

3
postgres/entrypoint.sh
View File

@@ -5,7 +5,8 @@ cd /home/container
postgres --version postgres --version
# Make internal Docker IP address available to processes. # Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`

3
python/entrypoint.sh
View File

@@ -2,7 +2,8 @@
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Print current Python version # Print current Python version
python --version python --version

3
redis/entrypoint.sh
View File

@@ -2,7 +2,8 @@
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Replace Startup Variables # Replace Startup Variables
MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')

3
rust/entrypoint.sh
View File

@@ -2,7 +2,8 @@
cd /home/container cd /home/container
# Make internal Docker IP address available to processes. # Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
# Print current Rust version # Print current Rust version
cargo --version cargo --version

2
voice/teaspeak/entrypoint.sh
View File

@@ -3,7 +3,7 @@ TZ=${TZ:-UTC}
export TZ export TZ
# Set environment variable that holds the Internal Docker IP # Set environment variable that holds the Internal Docker IP
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP export INTERNAL_IP
# Switch to the container's working directory # Switch to the container's working directory

3
wine/entrypoint.sh
View File

@@ -7,7 +7,8 @@ echo "Current timezone: $(cat /etc/timezone)"
wine --version wine --version
# Make internal Docker IP address available to processes. # Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
export INTERNAL_IP
## just in case someone removed the defaults. ## just in case someone removed the defaults.
if [ "${STEAM_USER}" == "" ]; then if [ "${STEAM_USER}" == "" ]; then