radarsys Commit - r374:6ed53abd7002 · Jicamarca Repository

Se cambia el modo de descarga de las piplibraries a descarga remota desde el servidor, se elimina una de las creaciones de los usuarios de postfres, ya se hizo la prueba con todos los dispositivos

Renato-TUF -

r374:6ed53abd7002

parent child

Context file:

r374:6ed53abd7002

Collapse all files

.env +3 -3

              REDIS_HOST=radarsys-redis
              REDIS_PORT=6300
              POSTGRES_PORT_5432_TCP_ADDR=radarsys-postgres
              #    POSTGRES_PORT_5432_TCP_PORT=5400
              POSTGRES_PORT_5432_TCP_PORT=5432
              #POSTGRES_HOST?? DONDE IRIA
-             POSTGRES_USER=docker
-             POSTGRES_PASSWORD=docker
-             POSTGRES_DB=radarsys
+             # POSTGRES_USER=docker
+             # POSTGRES_PASSWORD=docker
+             # POSTGRES_DB=radarsys
              # DB_NAME=radarsys
              # DB_USER=docker
              # DB_PASSWORD=docker
              PGDATA=/var/lib/postgresql/data
              LC_ALL=C.UTF-8
              TZ=America/Lima
              DOCKER_DATA=/data/dockers/radarsys/
              LOCAL_IP=192.168.1.128
  No newline at end of file

.gitignore +1 0

              pipLibraries/
              .DS_Store
              *.sqlite
              .vscode/
              *.pyc
              .env
              remove_migrations.py
+             migrations/

Dockerfile +16 -16

              FROM python:3.9.16-slim-bullseye
              # set working directory
              RUN mkdir /radarsys
              RUN pwd
              WORKDIR /radarsys
              COPY /pipLibraries ./
              RUN pwd
              RUN ls -al
              # Install python dependences
              ADD requirements.txt ./requirements.txt
              RUN apt-get clean && apt-get update && apt-get install -y --no-install-recommends \
              	gcc \
                  g++ \
-                 && pip install -v --timeout 120 --no-cache-dir ./Django-4.1.5-py3-none-any.whl \
-                 && pip install -v --timeout 120 --no-cache-dir ./django-bootstrap5-22.2.tar.gz \
-                 && pip install -v --timeout 120 --no-cache-dir ./psycopg2_binary-2.9.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl \
-                 && pip install -v --timeout 120 --no-cache-dir ./django-polymorphic-3.1.0.tar.gz \
-                 && pip install -v --timeout 120 --no-cache-dir ./numpy-1.24.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl \
-                 && pip install -v --timeout 120 --no-cache-dir ./bokeh-3.0.3-py3-none-any.whl\
-                 && pip install -v --timeout 120 --no-cache-dir ./matplotlib-3.6.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl   \
-                 && pip install -v --timeout 120 --no-cache-dir ./scipy-1.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl \
-                 && pip install -v --timeout 120 --no-cache-dir ./celery-5.2.7.tar.gz \
-                 && pip install -v --timeout 120 --no-cache-dir ./gunicorn-20.1.0-py3-none-any.whl \
-                 && pip install -v --timeout 120 --no-cache-dir ./requests-2.28.2-py3-none-any.whl \
-                 && pip install -v --timeout 120 --no-cache-dir ./redis-4.4.2-py3-none-any.whl \
-                 && pip install -v --timeout 120 --no-cache-dir ./graphene_django-3.0.0-py2.py3-none-any.whl \
-                 && pip install -v --timeout 120 --no-cache-dir ./channels-4.0.0.tar.gz \
-                 && pip install -v --timeout 120 --no-cache-dir ./daphne-4.0.0.tar.gz \
-             #&& pip install -v --timeout 120 -r requirements.txt --no-cache-dir \
+                 # && pip install -v --timeout 120 --no-cache-dir ./Django-4.1.5-py3-none-any.whl \
+                 # && pip install -v --timeout 120 --no-cache-dir ./django-bootstrap5-22.2.tar.gz \
+                 # && pip install -v --timeout 120 --no-cache-dir ./psycopg2_binary-2.9.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl \
+                 # && pip install -v --timeout 120 --no-cache-dir ./django-polymorphic-3.1.0.tar.gz \
+                 # && pip install -v --timeout 120 --no-cache-dir ./numpy-1.24.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl \
+                 # && pip install -v --timeout 120 --no-cache-dir ./bokeh-3.0.3-py3-none-any.whl\
+                 # && pip install -v --timeout 120 --no-cache-dir ./matplotlib-3.6.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl   \
+                 # && pip install -v --timeout 120 --no-cache-dir ./scipy-1.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl \
+                 # && pip install -v --timeout 120 --no-cache-dir ./celery-5.2.7.tar.gz \
+                 # && pip install -v --timeout 120 --no-cache-dir ./gunicorn-20.1.0-py3-none-any.whl \
+                 # && pip install -v --timeout 120 --no-cache-dir ./requests-2.28.2-py3-none-any.whl \
+                 # && pip install -v --timeout 120 --no-cache-dir ./redis-4.4.2-py3-none-any.whl \
+                 # && pip install -v --timeout 120 --no-cache-dir ./graphene_django-3.0.0-py2.py3-none-any.whl \
+                 # && pip install -v --timeout 120 --no-cache-dir ./channels-4.0.0.tar.gz \
+                 # && pip install -v --timeout 120 --no-cache-dir ./daphne-4.0.0.tar.gz \
+                 && pip install -v --timeout 120 -r requirements.txt --no-cache-dir \
                  && apt-get purge -y --auto-remove gcc g++\
              	&& rm -rf /var/lib/apt/lists/*
              # Copy the main application.
              COPY . ./
              EXPOSE 8000

docker-compose.yml +6 -5

-             version: '2'
+             version: '3'
              services:
               # Django app
                web:
                  container_name: 'radarsys'
                  build: .
                  restart: always
                  image: radarsys
                  command: gunicorn radarsys.wsgi:application -w 2 -b :8000
                  #command: python manage.py runserver 0.0.0.0:8000
                  ports:
                    - 8000:8000
                  #ports:
                  #  - 8030:8030
                  env_file: .env
                  links:
                #    - redis
                    - postgres
                  volumes:
                    - './:/radarsys'
                    - '${DOCKER_DATA}/static:/radarsys/static'
                  depends_on:
                #    - redis
                    - postgres
                # redis:
                #   container_name: 'radarsys-redis'
                #   image: 'redis:3.2-alpine'
                #   volumes:
                #     - '${DOCKER_DATA}/redis:/data'
                # celery_worker:
                #   container_name: 'radarsys-celery'
                #   image: radarsys
                #   env_file: .env
                #   command: celery -A radarsys worker -l info
                #   volumes_from:
                #     - web
                #   depends_on:
                #     - web
                # PostgreSQL
                postgres:
                  container_name: 'radarsys-postgres'
                  build: ./postgres/
                  volumes:
                    - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
                    - pgdata:/var/lib/postgresql/data
                  ports:
                   - 5432:5432
-                 environment:
-                   - POSTGRES_PASSWORD=docker
-                   - POSTGRES_USER=docker
-                   - POSTGRES_DB=radarsys
+                 #TEMPORAL, NO DEBE HARDCODEARSE
+                 # environment:
+                 #   - POSTGRES_PASSWORD=docker
+                 #   - POSTGRES_USER=docker
+                 #   - POSTGRES_DB=radarsys
                  env_file: .env
                #Web Server
                nginx:
                  container_name: 'radarsys-nginx'
                  restart: always
                  build: ./nginx/
                  ports:
                    - '8030:8030'
                  volumes_from:
                    - web
                  links:
                    - web:web
                  depends_on:
                    - web
              volumes:
                pgdata:
                  driver: local

postgres/Dockerfile +2 -1

              FROM postgres:14.6-alpine
              #FROM library/postgres
              RUN mkdir -p "$PGDATA" && chmod 700 "$PGDATA"
-             #COPY ./init.sql /docker-entrypoint-initdb.d/
  No newline at end of file
+             #COPY ./init.sql /docker-entrypoint-initdb.d/
+             COPY init.sql /docker-entrypoint-initdb.d/
  No newline at end of file

requirements.txt +1 -1

              Django==4.1.5
              django-bootstrap5==22.2
              psycopg2-binary==2.9.5
              django-polymorphic==3.1
              bokeh==3.0.3
              numpy==1.24.1
              matplotlib==3.6.3
              scipy==1.10.0
              celery==5.2.7
              gunicorn==20.1.0
              requests==2.28.2
              redis==4.4.2
              channels==4.0.0
-             daphne==4.0.0
+             daphne==4.0.0
  No newline at end of file

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages