elie/docker-idrac6
1
0
Fork 0
mirror of https://github.com/DomiStyle/docker-idrac6.git synced 2024-12-22 22:05:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use curl instead of wget

Browse Source
This commit is contained in:
Stephen Moss 2022-07-18 23:35:39 -07:00
parent 9b5e1ce68c
commit 2fb6bc113e
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ idrac_host.txt
idrac_password.txt idrac_password.txt
idrac_user.txt idrac_user.txt
idrac_port.txt idrac_port.txt
.idea

2
Dockerfile
View File

@ -11,7 +11,7 @@ RUN APP_ICON_URL=https://raw.githubusercontent.com/DomiStyle/docker-idrac6/maste
install_app_icon.sh "$APP_ICON_URL" install_app_icon.sh "$APP_ICON_URL"
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y wget software-properties-common libx11-dev gcc xdotool && \ apt-get install -y wget software-properties-common libx11-dev gcc xdotool curl && \
wget -nc https://cdn.azul.com/zulu/bin/zulu7.52.0.11-ca-jdk7.0.332-linux_amd64.deb && \ wget -nc https://cdn.azul.com/zulu/bin/zulu7.52.0.11-ca-jdk7.0.332-linux_amd64.deb && \
apt-get install -y ./zulu7.52.0.11-ca-jdk7.0.332-linux_amd64.deb && \ apt-get install -y ./zulu7.52.0.11-ca-jdk7.0.332-linux_amd64.deb && \
gcc -o /keycode-hack.so /keycode-hack.c -shared -s -ldl -fPIC && \ gcc -o /keycode-hack.so /keycode-hack.c -shared -s -ldl -fPIC && \

16
startapp.sh
View File

@ -4,6 +4,10 @@ GREEN='\033[0;32m'
RED='\033[0;31m' RED='\033[0;31m'
NC='\033[0m' NC='\033[0m'
_curl() {
curl --verbose --insecure --ciphers 'DEFAULT:!DH' "$@"
}
echo "Starting" echo "Starting"
if [ -f "/run/secrets/idrac_host" ]; then if [ -f "/run/secrets/idrac_host" ]; then
@ -52,7 +56,7 @@ fi
echo "Environment ok" echo "Environment ok"
cd /app cd /app || exit
if [ ! -d "lib" ]; then if [ ! -d "lib" ]; then
echo "Creating library folder" echo "Creating library folder"
@ -62,7 +66,7 @@ fi
if [ ! -f avctKVM.jar ]; then if [ ! -f avctKVM.jar ]; then
echo "Downloading avctKVM" echo "Downloading avctKVM"
wget https://${IDRAC_HOST}:${IDRAC_PORT}/software/avctKVM.jar --no-check-certificate _curl -o avctKVM.jar https://"${IDRAC_HOST}":"${IDRAC_PORT}"/software/avctKVM.jar
if [ ! $? -eq 0 ]; then if [ ! $? -eq 0 ]; then
echo "${RED}Failed to download avctKVM.jar, please check your settings${NC}" echo "${RED}Failed to download avctKVM.jar, please check your settings${NC}"
@ -74,7 +78,7 @@ fi
if [ ! -f lib/avctKVMIOLinux64.jar ]; then if [ ! -f lib/avctKVMIOLinux64.jar ]; then
echo "Downloading avctKVMIOLinux64" echo "Downloading avctKVMIOLinux64"
wget -O lib/avctKVMIOLinux64.jar https://${IDRAC_HOST}:${IDRAC_PORT}/software/avctKVMIOLinux64.jar --no-check-certificate _curl -o lib/avctKVMIOLinux64.jar https://"${IDRAC_HOST}":"${IDRAC_PORT}"/software/avctKVMIOLinux64.jar
if [ ! $? -eq 0 ]; then if [ ! $? -eq 0 ]; then
echo "${RED}Failed to download avctKVMIOLinux64.jar, please check your settings${NC}" echo "${RED}Failed to download avctKVMIOLinux64.jar, please check your settings${NC}"
@ -86,7 +90,7 @@ fi
if [ ! -f lib/avctVMLinux64.jar ]; then if [ ! -f lib/avctVMLinux64.jar ]; then
echo "Downloading avctVMLinux64" echo "Downloading avctVMLinux64"
wget -O lib/avctVMLinux64.jar https://${IDRAC_HOST}:${IDRAC_PORT}/software/avctVMLinux64.jar --no-check-certificate _curl -o lib/avctVMLinux64.jar https://"${IDRAC_HOST}":"${IDRAC_PORT}"/software/avctVMLinux64.jar
if [ ! $? -eq 0 ]; then if [ ! $? -eq 0 ]; then
echo "${RED}Failed to download avctVMLinux64.jar, please check your settings${NC}" echo "${RED}Failed to download avctVMLinux64.jar, please check your settings${NC}"
@ -95,7 +99,7 @@ if [ ! -f lib/avctVMLinux64.jar ]; then
fi fi
fi fi
cd lib cd lib || exit
if [ ! -f lib/avctKVMIOLinux64.so ]; then if [ ! -f lib/avctKVMIOLinux64.so ]; then
echo "Extracting avctKVMIOLinux64" echo "Extracting avctKVMIOLinux64"
@ -109,7 +113,7 @@ if [ ! -f lib/avctVMLinux64.so ]; then
jar -xf avctVMLinux64.jar jar -xf avctVMLinux64.jar
fi fi
cd /app cd /app || exit
echo "${GREEN}Initialization complete, starting virtual console${NC}" echo "${GREEN}Initialization complete, starting virtual console${NC}"