From 3bebe99ee5458a5265420e84a9aff27b2fe81bee Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Tue, 5 May 2020 18:30:19 +0200 Subject: [PATCH] Docker build: single discover_my_public_ip.sh script --- .../docker/openvidu-coturn/Dockerfile | 2 +- .../docker/openvidu-proxy/Dockerfile | 2 +- .../openvidu-proxy/discover_my_public_ip.sh | 47 ------------------- .../docker/openvidu-server-pro/Dockerfile | 2 +- .../discover_my_public_ip.sh | 47 ------------------- .../docker/openvidu-server/Dockerfile | 2 +- .../openvidu-server/discover_my_public_ip.sh | 47 ------------------- .../discover_my_public_ip.sh | 0 8 files changed, 4 insertions(+), 145 deletions(-) delete mode 100755 openvidu-server/docker/openvidu-proxy/discover_my_public_ip.sh delete mode 100755 openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh delete mode 100755 openvidu-server/docker/openvidu-server/discover_my_public_ip.sh rename openvidu-server/docker/{openvidu-coturn => utils}/discover_my_public_ip.sh (100%) diff --git a/openvidu-server/docker/openvidu-coturn/Dockerfile b/openvidu-server/docker/openvidu-coturn/Dockerfile index eac2ee94..2800a50d 100644 --- a/openvidu-server/docker/openvidu-coturn/Dockerfile +++ b/openvidu-server/docker/openvidu-coturn/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update \ COPY ./configuration-files.sh /tmp/ COPY ./entrypoint.sh /usr/local/bin -COPY ./discover_my_public_ip.sh /usr/local/bin +COPY ../utils/discover_my_public_ip.sh /usr/local/bin RUN chmod +x /tmp/configuration-files.sh \ && chmod +x /usr/local/bin/entrypoint.sh \ diff --git a/openvidu-server/docker/openvidu-proxy/Dockerfile b/openvidu-server/docker/openvidu-proxy/Dockerfile index b29fd066..696725dc 100644 --- a/openvidu-server/docker/openvidu-proxy/Dockerfile +++ b/openvidu-server/docker/openvidu-proxy/Dockerfile @@ -13,7 +13,7 @@ COPY ./default.conf /etc/nginx/conf.d/default.conf COPY ./default_nginx_conf /default_nginx_conf # Entrypoint and discover public ip scripts -COPY ./discover_my_public_ip.sh /usr/local/bin +COPY ../utils/discover_my_public_ip.sh /usr/local/bin COPY ./entrypoint.sh /usr/local/bin RUN mkdir -p /var/www/certbot && \ diff --git a/openvidu-server/docker/openvidu-proxy/discover_my_public_ip.sh b/openvidu-server/docker/openvidu-proxy/discover_my_public_ip.sh deleted file mode 100755 index b42b3a97..00000000 --- a/openvidu-server/docker/openvidu-proxy/discover_my_public_ip.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -# Check if a txt is a valid ip -function valid_ip() -{ - local ip=$1 - local stat=1 - - if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - OIFS=$IFS - IFS='.' - ip=($ip) - IFS=$OIFS - [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \ - && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]] - stat=$? - fi - return $stat -} - -# Services to get public ip -SERVICES=( - "curl --silent -sw :%{http_code} ipv4.icanhazip.com" - "curl --silent -sw :%{http_code} ifconfig.me" - "curl --silent -sw :%{http_code} -4 ifconfig.co" - "curl --silent -sw :%{http_code} ipecho.net/plain" - "curl --silent -sw :%{http_code} ipinfo.io/ip" - "curl --silent -sw :%{http_code} checkip.amazonaws.com" - "curl --silent -sw :%{http_code} v4.ident.me" -) - -# Get public ip -for service in "${SERVICES[@]}"; do - RUN_COMMAND=$($service | tr -d '[:space:]') - IP=$(echo "$RUN_COMMAND" | cut -d':' -f1) - HTTP_CODE=$(echo "$RUN_COMMAND" | cut -d':' -f2) - - if [ "$HTTP_CODE" == "200" ]; then - if valid_ip "$IP"; then - printf "%s" "$IP" - exit 0 - fi - fi -done - -printf "error" -exit 0 \ No newline at end of file diff --git a/openvidu-server/docker/openvidu-server-pro/Dockerfile b/openvidu-server/docker/openvidu-server-pro/Dockerfile index fe4b10a4..3c0a2126 100644 --- a/openvidu-server/docker/openvidu-server-pro/Dockerfile +++ b/openvidu-server/docker/openvidu-server-pro/Dockerfile @@ -18,7 +18,7 @@ RUN mkdir -p /opt/openvidu /usr/local/bin/ COPY openvidu-server.jar /opt/openvidu/openvidu-server.jar COPY ./entrypoint.sh /usr/local/bin -COPY ./discover_my_public_ip.sh /usr/local/bin +COPY ../utils/discover_my_public_ip.sh /usr/local/bin RUN mkdir -p /opt/openvidu/recordings && \ chmod +x /usr/local/bin/entrypoint.sh && \ diff --git a/openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh b/openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh deleted file mode 100755 index b42b3a97..00000000 --- a/openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -# Check if a txt is a valid ip -function valid_ip() -{ - local ip=$1 - local stat=1 - - if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - OIFS=$IFS - IFS='.' - ip=($ip) - IFS=$OIFS - [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \ - && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]] - stat=$? - fi - return $stat -} - -# Services to get public ip -SERVICES=( - "curl --silent -sw :%{http_code} ipv4.icanhazip.com" - "curl --silent -sw :%{http_code} ifconfig.me" - "curl --silent -sw :%{http_code} -4 ifconfig.co" - "curl --silent -sw :%{http_code} ipecho.net/plain" - "curl --silent -sw :%{http_code} ipinfo.io/ip" - "curl --silent -sw :%{http_code} checkip.amazonaws.com" - "curl --silent -sw :%{http_code} v4.ident.me" -) - -# Get public ip -for service in "${SERVICES[@]}"; do - RUN_COMMAND=$($service | tr -d '[:space:]') - IP=$(echo "$RUN_COMMAND" | cut -d':' -f1) - HTTP_CODE=$(echo "$RUN_COMMAND" | cut -d':' -f2) - - if [ "$HTTP_CODE" == "200" ]; then - if valid_ip "$IP"; then - printf "%s" "$IP" - exit 0 - fi - fi -done - -printf "error" -exit 0 \ No newline at end of file diff --git a/openvidu-server/docker/openvidu-server/Dockerfile b/openvidu-server/docker/openvidu-server/Dockerfile index 4ecbff57..24f15855 100644 --- a/openvidu-server/docker/openvidu-server/Dockerfile +++ b/openvidu-server/docker/openvidu-server/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \ # Copy OpenVidu Server COPY openvidu-server.jar / COPY ./entrypoint.sh /usr/local/bin -COPY ./discover_my_public_ip.sh /usr/local/bin +COPY ../utils/discover_my_public_ip.sh /usr/local/bin RUN chmod +x /usr/local/bin/entrypoint.sh && \ chmod +x /usr/local/bin/discover_my_public_ip.sh diff --git a/openvidu-server/docker/openvidu-server/discover_my_public_ip.sh b/openvidu-server/docker/openvidu-server/discover_my_public_ip.sh deleted file mode 100755 index b42b3a97..00000000 --- a/openvidu-server/docker/openvidu-server/discover_my_public_ip.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -# Check if a txt is a valid ip -function valid_ip() -{ - local ip=$1 - local stat=1 - - if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - OIFS=$IFS - IFS='.' - ip=($ip) - IFS=$OIFS - [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \ - && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]] - stat=$? - fi - return $stat -} - -# Services to get public ip -SERVICES=( - "curl --silent -sw :%{http_code} ipv4.icanhazip.com" - "curl --silent -sw :%{http_code} ifconfig.me" - "curl --silent -sw :%{http_code} -4 ifconfig.co" - "curl --silent -sw :%{http_code} ipecho.net/plain" - "curl --silent -sw :%{http_code} ipinfo.io/ip" - "curl --silent -sw :%{http_code} checkip.amazonaws.com" - "curl --silent -sw :%{http_code} v4.ident.me" -) - -# Get public ip -for service in "${SERVICES[@]}"; do - RUN_COMMAND=$($service | tr -d '[:space:]') - IP=$(echo "$RUN_COMMAND" | cut -d':' -f1) - HTTP_CODE=$(echo "$RUN_COMMAND" | cut -d':' -f2) - - if [ "$HTTP_CODE" == "200" ]; then - if valid_ip "$IP"; then - printf "%s" "$IP" - exit 0 - fi - fi -done - -printf "error" -exit 0 \ No newline at end of file diff --git a/openvidu-server/docker/openvidu-coturn/discover_my_public_ip.sh b/openvidu-server/docker/utils/discover_my_public_ip.sh similarity index 100% rename from openvidu-server/docker/openvidu-coturn/discover_my_public_ip.sh rename to openvidu-server/docker/utils/discover_my_public_ip.sh