From 1f49a1b03843b3aca48049818fa77f5b1841bcdd Mon Sep 17 00:00:00 2001 From: Mohamed Nouffer Date: Sat, 5 Nov 2022 14:31:55 +0530 Subject: [PATCH] update for image url --- .DS_Store | Bin 0 -> 8196 bytes Dockerfile.gdal | 4 + docker-compose.yaml | 31 +++---- rog/serializers.py | 5 ++ rog/views.py | 24 +++--- wait-for-postgres.sh | 15 ++++ wait-for.sh | 191 +++++++++++++++++++++++++++++++++++++++++++ wait.py | 14 ++++ 8 files changed, 257 insertions(+), 27 deletions(-) create mode 100644 .DS_Store create mode 100644 wait-for-postgres.sh create mode 100644 wait-for.sh create mode 100644 wait.py diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..7c412d2c06529a7a60db7ad998af05483b8f82c5 GIT binary patch literal 8196 zcmeHMF>4e-6#gc;(~A)eXb})$D;vFo*b8e|3k5-lja@c(m&@U8_L5vQDa6G}5J9-k z!qUdV9})kBou!SoR{Fh};cjO4&LV{boPn9Q%)IZ-d*7SA;q3uX>xZ2+U==`vUF6C# zhZ#-QrB~X5ow-h_h{vF}w$aYBVMQ}c1O@^Ffq}q4U?4DXRv6%&Ev+%<-Z!gZ3=9MY z{!0er_aR~z8CzKxsed{+=n{ak#%bO7ydn>jk(IHPg^^rgQwB(6k(M-tfjOFPHtX3~vhUb&bNT9KbMJvUcb>*Hle0D4 zJl4nWxB+h&@`XJd(pPyBzjrZW7F!&TF!KG^IdJ`7Bq}eTTFv+jEjL0eJh{#NE#8gp z$BmQM-(TprYO*?wth(w(h1ySvYKig4Io#KAv^hR2#UVL%J-mwN%rD=4p5<+QikkK` zkC=5~Mi@E3j&DaYuP!;6U#{4hff5!y)cFZ&*6HGzakL8w5K3tg?teo=7y|>RW?<1E zSEc^HH~;(psqF_~U?4DX_8CyMWFuLppZ0F8cr3Mc#JC=PC5C* bkk1iS1ru9Y7|9v7@F76c5Qf0OKV{$#O65H^ literal 0 HcmV?d00001 diff --git a/Dockerfile.gdal b/Dockerfile.gdal index 0b214f3..fc6f31a 100644 --- a/Dockerfile.gdal +++ b/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 diff --git a/docker-compose.yaml b/docker-compose.yaml index b33064f..4dfda93 100644 --- a/docker-compose.yaml +++ b/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 - - 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 - + #entrypoint: ["/app/wait-for.sh", "postgres-db:5432", "--", ""] + #command: python3 manage.py runserver 0.0.0.0:8100 networks: rog-api: diff --git a/rog/serializers.py b/rog/serializers.py index 383f552..9ebc02b 100644 --- a/rog/serializers.py +++ b/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): diff --git a/rog/views.py b/rog/views.py index b3741e0..192bb6a 100644 --- a/rog/views.py +++ b/rog/views.py @@ -283,20 +283,20 @@ class UserAPI(generics.RetrieveAPIView): # @api_view(['POST',]) # @permission_classes((IsAuthenticated,)) # @csrf_exempt -class GoalImageViewSet(APIView): - permissions_classes = [permissions.IsAuthenticated,] - # parser_classes = [MultiPartParser, JSONParser] +# class GoalImageViewSet(APIView): +# permissions_classes = [permissions.IsAuthenticated,] +# # parser_classes = [MultiPartParser, JSONParser] - def post(self, request, format=None): - # print(request.data) - serializer = GolaImageSerializer(data=request.data) - if serializer.is_valid(): - serializer.save() - return Response(serializer.data, status=status.HttP_200_OK) - else: - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) +# def post(self, request, format=None): +# # print(request.data) +# serializer = GolaImageSerializer(data=request.data) +# if serializer.is_valid(): +# serializer.save() +# return Response(serializer.data, status=status.HttP_200_OK) +# else: +# 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() diff --git a/wait-for-postgres.sh b/wait-for-postgres.sh new file mode 100644 index 0000000..400d686 --- /dev/null +++ b/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 "$@" \ No newline at end of file diff --git a/wait-for.sh b/wait-for.sh new file mode 100644 index 0000000..eae37dd --- /dev/null +++ b/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 "$@" diff --git a/wait.py b/wait.py new file mode 100644 index 0000000..3e14d5f --- /dev/null +++ b/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) \ No newline at end of file