From 8916f87a039223cdb6b7690ccc7508d5c23aa0f8 Mon Sep 17 00:00:00 2001 From: mikhailtreskin Date: Tue, 5 Sep 2023 19:10:24 +0300 Subject: [PATCH] Add pgadmin and internal_access containers as components --- components/internal_access/Dockerfile | 3 +++ .../docker-compose.entry_point.yml | 19 +++++++++++++++ components/pg_admin/Dockerfile | 3 +++ .../pg_admin/docker-compose.pg_admin.yml | 24 +++++++++++++++++++ components/pg_admin/server_config.json | 22 +++++++++++++++++ 5 files changed, 71 insertions(+) create mode 100644 components/internal_access/Dockerfile create mode 100644 components/internal_access/docker-compose.entry_point.yml create mode 100644 components/pg_admin/Dockerfile create mode 100644 components/pg_admin/docker-compose.pg_admin.yml create mode 100644 components/pg_admin/server_config.json diff --git a/components/internal_access/Dockerfile b/components/internal_access/Dockerfile new file mode 100644 index 000000000000..55e46e39c152 --- /dev/null +++ b/components/internal_access/Dockerfile @@ -0,0 +1,3 @@ +FROM python:latest +COPY ../../cvat_scripts/cvat_tasks/requirements.txt /tmp/requirements.txt +#RUN pip install psycopg2-binary -r /tmp/requirements.txt diff --git a/components/internal_access/docker-compose.entry_point.yml b/components/internal_access/docker-compose.entry_point.yml new file mode 100644 index 000000000000..7c55fef68a9b --- /dev/null +++ b/components/internal_access/docker-compose.entry_point.yml @@ -0,0 +1,19 @@ +services: + internal_access: + container_name: internal_access + build: ./components/internal_access + restart: always + networks: + - cvat + logging: + driver: "json-file" + options: + max-size: 100m + max-file: "3" + volumes: + - ../../cvat_scripts/cvat_tasks:/home/cvat_tasks + environment: + - CVAT_INTERNALS=1 + stdin_open: true + tty: true + diff --git a/components/pg_admin/Dockerfile b/components/pg_admin/Dockerfile new file mode 100644 index 000000000000..003ec98dcde3 --- /dev/null +++ b/components/pg_admin/Dockerfile @@ -0,0 +1,3 @@ +FROM dpage/pgadmin4 +COPY ./server_config.json /tmp +RUN source /venv/bin/activate && python3 /pgadmin4/setup.py --load-servers /tmp/server_config.json --user bvi.admin@retailnext.net diff --git a/components/pg_admin/docker-compose.pg_admin.yml b/components/pg_admin/docker-compose.pg_admin.yml new file mode 100644 index 000000000000..870ec07c3935 --- /dev/null +++ b/components/pg_admin/docker-compose.pg_admin.yml @@ -0,0 +1,24 @@ +services: + pgadmin: + container_name: pg_admin + build: ./components/pg_admin + restart: always + depends_on: + - cvat_db + networks: + - cvat + environment: + PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL} + PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD} + ports: + - "8888:80" + logging: + driver: "json-file" + options: + max-size: 100m + max-file: "3" + volumes: + - pgadmin-data:/var/lib/pgadmin +volumes: + pgadmin-data: + diff --git a/components/pg_admin/server_config.json b/components/pg_admin/server_config.json new file mode 100644 index 000000000000..303b2af2b1e5 --- /dev/null +++ b/components/pg_admin/server_config.json @@ -0,0 +1,22 @@ +{ + "Servers": { + "1": { + "Name": "cvat", + "Group": "Servers", + "Host": "cvat_db", + "Port": 5432, + "MaintenanceDB": "postgres", + "Username": "root", + "UseSSHTunnel": 0, + "TunnelPort": "22", + "TunnelAuthentication": 0, + "KerberosAuthentication": false, + "ConnectionParameters": { + "sslmode": "prefer", + "connect_timeout": 10, + "sslcert": "/.postgresql/postgresql.crt", + "sslkey": "/.postgresql/postgresql.key" + } + } + } +}