update for image url

Dockerfile.gdal

@@ -49,6 +49,10 @@ RUN apt-get update
 
 COPY ./requirements.txt /app/requirements.txt
 
+#COPY ./wait-for.sh .
+
+#RUN ["chmod", "+x", "wait-for.sh"]
+
 RUN pip install -r requirements.txt
 
 COPY . /app

docker-compose.yaml

@@ -1,6 +1,20 @@
 version: "3.9"
 
 services:
+   postgres-db:
+      image: kartoza/postgis:12.0
+      ports:
+         - 5432:5432
+      volumes:
+         - postgres_data:/var/lib/postgresql
+      environment:
+         - POSTGRES_USER=${POSTGRES_USER}
+         - POSTGRES_PASS=${POSTGRES_PASS}
+         - POSTGRES_DBNAME=${POSTGRES_DBNAME}
+      restart: "on-failure"
+      networks:
+         - rog-api
+         
    api:
       build:
          context: .
@@ -17,21 +31,8 @@ services:
          - postgres-db
       networks:
          - rog-api
-
+      #entrypoint: ["/app/wait-for.sh", "postgres-db:5432", "--", ""]
-   postgres-db:
+      #command: python3 manage.py runserver 0.0.0.0:8100
-      image: kartoza/postgis:12.0
-      ports:
-         - 5432:5432
-      volumes:
-         - postgres_data:/var/lib/postgresql
-      environment:
-         - POSTGRES_USER=${POSTGRES_USER}
-         - POSTGRES_PASS=${POSTGRES_PASS}
-         - POSTGRES_DBNAME=${POSTGRES_DBNAME}
-      restart: "on-failure"
-      networks:
-         - rog-api
-
 
 networks:
    rog-api:

rog/serializers.py

@@ -81,6 +81,11 @@ class GolaImageSerializer(serializers.ModelSerializer):
     class Meta:
         model = GoalImages
         fields="__all__"
+    
+    def get_goalimage_url(self, car):
+        request = self.context.get('request')
+        photo_url = GoalImages.goalimage.url
+        return request.build_absolute_uri(photo_url)
 
 
 class RogUserSerializer(serializers.ModelSerializer):

rog/views.py

@@ -283,20 +283,20 @@ class UserAPI(generics.RetrieveAPIView):
 # @api_view(['POST',])
 # @permission_classes((IsAuthenticated,))
 # @csrf_exempt 
-class GoalImageViewSet(APIView):
+# class GoalImageViewSet(APIView):
-    permissions_classes = [permissions.IsAuthenticated,]
+#     permissions_classes = [permissions.IsAuthenticated,]
-    # parser_classes = [MultiPartParser, JSONParser]
+#     # parser_classes = [MultiPartParser, JSONParser]
 
-    def post(self, request, format=None):
+#     def post(self, request, format=None):
-        # print(request.data)
+#         # print(request.data)
-        serializer = GolaImageSerializer(data=request.data)
+#         serializer = GolaImageSerializer(data=request.data)
-        if serializer.is_valid():
+#         if serializer.is_valid():
-            serializer.save()
+#             serializer.save()
-            return Response(serializer.data, status=status.HttP_200_OK)
+#             return Response(serializer.data, status=status.HttP_200_OK)
-        else:
+#         else:
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+#             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-        return Response({"ok":"ok"})
+#         return Response({"ok":"ok"})
 
 class GoalImageViewSet(viewsets.ModelViewSet):
     queryset=GoalImages.objects.all()

wait-for-postgres.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+# wait-for-postgres.sh
+
+set -e
+  
+host="$1"
+shift
+  
+until PGPASSWORD=$POSTGRES_PASS psql -h "$host" -U "postgres" -c '\q'; do
+  >&2 echo "Postgres is unavailable - sleeping"
+  sleep 1
+done
+  
+>&2 echo "Postgres is up - executing command"
+exec "$@"

wait-for.sh

@@ -0,0 +1,191 @@
+#!/bin/sh
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2017 Eficode Oy
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+VERSION="2.2.3"
+
+set -- "$@" -- "$TIMEOUT" "$QUIET" "$PROTOCOL" "$HOST" "$PORT" "$result"
+TIMEOUT=15
+QUIET=0
+# The protocol to make the request with, either "tcp" or "http"
+PROTOCOL="tcp"
+
+echoerr() {
+  if [ "$QUIET" -ne 1 ]; then printf "%s\n" "$*" 1>&2; fi
+}
+
+usage() {
+  exitcode="$1"
+  cat << USAGE >&2
+Usage:
+  $0 host:port|url [-t timeout] [-- command args]
+  -q | --quiet                        Do not output any status messages
+  -t TIMEOUT | --timeout=timeout      Timeout in seconds, zero for no timeout
+  -v | --version                      Show the version of this tool
+  -- COMMAND ARGS                     Execute command with args after the test finishes
+USAGE
+  exit "$exitcode"
+}
+
+wait_for() {
+  case "$PROTOCOL" in
+    tcp)
+      if ! command -v nc >/dev/null; then
+        echoerr 'nc command is missing!'
+        exit 1
+      fi
+      ;;
+    http)
+      if ! command -v wget >/dev/null; then
+        echoerr 'wget command is missing!'
+        exit 1
+      fi
+      ;;
+  esac
+
+  TIMEOUT_END=$(($(date +%s) + TIMEOUT))
+
+  while :; do
+    case "$PROTOCOL" in
+      tcp) 
+        nc -w 1 -z "$HOST" "$PORT" > /dev/null 2>&1
+        ;;
+      http)
+        wget --timeout=1 -q "$HOST" -O /dev/null > /dev/null 2>&1 
+        ;;
+      *)
+        echoerr "Unknown protocol '$PROTOCOL'"
+        exit 1
+        ;;
+    esac
+
+    result=$?
+        
+    if [ $result -eq 0 ] ; then
+      if [ $# -gt 7 ] ; then
+        for result in $(seq $(($# - 7))); do
+          result=$1
+          shift
+          set -- "$@" "$result"
+        done
+
+        TIMEOUT=$2 QUIET=$3 PROTOCOL=$4 HOST=$5 PORT=$6 result=$7
+        shift 7
+        exec "$@"
+      fi
+      exit 0
+    fi
+
+    if [ $TIMEOUT -ne 0 -a $(date +%s) -ge $TIMEOUT_END ]; then
+      echo "Operation timed out" >&2
+      exit 1
+    fi
+
+    sleep 1
+  done
+}
+
+while :; do
+  case "$1" in
+    http://*|https://*)
+    HOST="$1"
+    PROTOCOL="http"
+    shift 1
+    ;;
+    *:* )
+    HOST=$(printf "%s\n" "$1"| cut -d : -f 1)
+    PORT=$(printf "%s\n" "$1"| cut -d : -f 2)
+    shift 1
+    ;;
+    -v | --version)
+    echo $VERSION
+    exit
+    ;;
+    -q | --quiet)
+    QUIET=1
+    shift 1
+    ;;
+    -q-*)
+    QUIET=0
+    echoerr "Unknown option: $1"
+    usage 1
+    ;;
+    -q*)
+    QUIET=1
+    result=$1
+    shift 1
+    set -- -"${result#-q}" "$@"
+    ;;
+    -t | --timeout)
+    TIMEOUT="$2"
+    shift 2
+    ;;
+    -t*)
+    TIMEOUT="${1#-t}"
+    shift 1
+    ;;
+    --timeout=*)
+    TIMEOUT="${1#*=}"
+    shift 1
+    ;;
+    --)
+    shift
+    break
+    ;;
+    --help)
+    usage 0
+    ;;
+    -*)
+    QUIET=0
+    echoerr "Unknown option: $1"
+    usage 1
+    ;;
+    *)
+    QUIET=0
+    echoerr "Unknown argument: $1"
+    usage 1
+    ;;
+  esac
+done
+
+if ! [ "$TIMEOUT" -ge 0 ] 2>/dev/null; then
+  echoerr "Error: invalid timeout '$TIMEOUT'"
+  usage 3
+fi
+
+case "$PROTOCOL" in
+  tcp)
+    if [ "$HOST" = "" ] || [ "$PORT" = "" ]; then
+      echoerr "Error: you need to provide a host and port to test."
+      usage 2
+    fi
+  ;;
+  http)
+    if [ "$HOST" = "" ]; then
+      echoerr "Error: you need to provide a host to test."
+      usage 2
+    fi
+  ;;
+esac
+
+wait_for "$@"

wait.py

@@ -0,0 +1,14 @@
+import socket
+import time
+import os
+
+port = 5432
+
+s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+while True:
+    try:
+        s.connect(('postgres-db', port))
+        s.close()
+        break
+    except socket.error as ex:
+        time.sleep(0.1)