Merge pull request #88 from GabrielInTheWorld/of-prod-setup

Updates the prod-setup

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14-buster-slim AS build
+FROM node:16 AS build
 
 WORKDIR /app
 
@@ -16,17 +16,13 @@ RUN npm run build
 
 RUN npm prune --production
 
-FROM node:14-buster-slim
-
-RUN apt-get -y update && apt-get -y upgrade && \
-    apt-get install --no-install-recommends -y wait-for-it
-
-RUN apt-get clean
+FROM node:16-alpine
 
 WORKDIR /app
 
 COPY --from=build /app/build .
 COPY --from=build /app/entrypoint.sh .
+COPY --from=build /app/wait-for.sh .
 COPY --from=build /app/node_modules ./node_modules
 
 EXPOSE 9004

Dockerfile.dev

@@ -2,7 +2,7 @@ FROM python:3.9.0-slim-buster
 
 RUN apt-get -y update && apt-get -y upgrade && \
     apt-get install --no-install-recommends -y wait-for-it && \
-    apt-get install -y make git curl
+    apt-get install -y make git curl netcat
 
 RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
 RUN apt-get install -y nodejs

auth/entrypoint.sh

@@ -5,7 +5,7 @@ set -e
 export CACHE_PORT="${CACHE_PORT:-6379}"
 export MESSAGE_BUS_PORT="${MESSAGE_BUS_PORT:-6379}"
 
-wait-for-it --timeout=10 "$CACHE_HOST:$CACHE_PORT"
-wait-for-it --timeout=10 "$MESSAGE_BUS_HOST:$MESSAGE_BUS_PORT"
+./wait-for.sh --timeout=10 "$CACHE_HOST:$CACHE_PORT"
+./wait-for.sh --timeout=10 "$MESSAGE_BUS_HOST:$MESSAGE_BUS_PORT"
 
 exec "$@"

auth/wait-for.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+TIMEOUT=1
+HOST=""
+PORT=""
+
+while [ "$1" != "" ]; do
+    PARAM=`echo $1 | awk -F= '{print $1}'`
+    VALUE=`echo $1 | awk -F= '{print $2}'`
+    case $PARAM in
+        *:* )
+            HOST=${PARAM%:*}
+            PORT=${PARAM#*:}
+            ;;
+        -t | --timeout)
+            if [ "$VALUE" -gt 0 ]; then
+                TIMEOUT=$VALUE
+            fi
+            ;;
+    esac
+    shift
+done
+
+while ! nc -z "$HOST" "$PORT"; do
+    echo "waiting for $HOST:$PORT for $TIMEOUT seconds..."
+    sleep $TIMEOUT
+done
+
+echo "$HOST:$PORT is available"