diff --git a/repo/docker-compose.full.yml b/repo/docker-compose.full.yml index 91f1ed5..20fa15b 100644 --- a/repo/docker-compose.full.yml +++ b/repo/docker-compose.full.yml @@ -24,32 +24,22 @@ services: extends: file: docker-services.yml service: cache - networks: - - am-d-model-repo-network db: extends: file: docker-services.yml service: db - networks: - - am-d-model-repo-network mq: extends: file: docker-services.yml service: mq - networks: - - am-d-model-repo-network search: extends: file: docker-services.yml service: search - networks: - - am-d-model-repo-network s3: extends: file: docker-services.yml service: s3 - networks: - - am-d-model-repo-network # UI Application web-ui: extends: @@ -61,8 +51,6 @@ services: - "5000" volumes: - static_data:/opt/invenio/var/instance/static - networks: - - am-d-model-repo-network # API Rest Application web-api: @@ -73,8 +61,6 @@ services: image: am-d-model-data-repository:latest ports: - "5000" - networks: - - am-d-model-repo-network # Worker worker: @@ -92,12 +78,6 @@ services: condition: service_started mq: condition: service_started - networks: - - am-d-model-repo-network -networks: - am-d-model-repo-network: - name: am-d-model-repo-network volumes: static_data: - data: redis_data: diff --git a/repo/docker-compose.yml b/repo/docker-compose.yml index 332ba4a..4e70444 100644 --- a/repo/docker-compose.yml +++ b/repo/docker-compose.yml @@ -19,35 +19,22 @@ services: extends: file: docker-services.yml service: cache - networks: - - am-d-model-repo-network db: extends: file: docker-services.yml service: db - networks: - - am-d-model-repo-network mq: extends: file: docker-services.yml service: mq - networks: - - am-d-model-repo-network search: extends: file: docker-services.yml service: search - networks: - - am-d-model-repo-network s3: extends: file: docker-services.yml service: s3 - networks: - - am-d-model-repo-network -networks: - am-d-model-repo-network: - name: am-d-model-repo-network volumes: data: redis_data: diff --git a/repo/docker-services.yml b/repo/docker-services.yml index c222a5c..bb75e8c 100644 --- a/repo/docker-services.yml +++ b/repo/docker-services.yml @@ -22,8 +22,6 @@ services: - "INVENIO_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://am-d-model-data-repository:am-d-model-data-repository@db/am-d-model-data-repository" - "INVENIO_WSGI_PROXIES=2" - "INVENIO_RATELIMIT_STORAGE_URL=redis://cache:6379/3" - networks: - - am-d-model-repo-network cache: image: redis:7 restart: "unless-stopped" @@ -33,8 +31,6 @@ services: - redis_data:/data ports: - "6379:6379" - networks: - - am-d-model-repo-network db: image: postgres:14.13 restart: "unless-stopped" @@ -46,8 +42,6 @@ services: - "POSTGRES_DB=am-d-model-data-repository" ports: - "5432" - networks: - - am-d-model-repo-network pgadmin: image: dpage/pgadmin4:6 restart: "unless-stopped" @@ -58,16 +52,12 @@ services: PGADMIN_DEFAULT_PASSWORD: "am-d-model-data-repository" volumes: - ./docker/pgadmin/servers.json:/pgadmin4/servers.json - networks: - - am-d-model-repo-network mq: image: rabbitmq:3-management restart: "unless-stopped" ports: - "15672" - "5672" - networks: - - am-d-model-repo-network search: image: opensearchproject/opensearch:2.17.1 restart: "unless-stopped" @@ -89,8 +79,6 @@ services: ports: - "9200" - "9600" - networks: - - am-d-model-repo-network opensearch-dashboards: image: opensearchproject/opensearch-dashboards:2.17.1 ports: @@ -101,8 +89,6 @@ services: # # settings only for development. DO NOT use in production! # - 'OPENSEARCH_HOSTS=["http://search:9200"]' # - "DISABLE_SECURITY_DASHBOARDS_PLUGIN=true" - networks: - - am-d-model-repo-network s3: image: minio/minio:RELEASE.2022-10-24T18-35-07Z restart: "unless-stopped" @@ -122,12 +108,6 @@ services: interval: 30s timeout: 20s retries: 3 - networks: - - am-d-model-repo-network volumes: redis_data: - -networks: - am-d-model-repo-network: - name: am-d-model-repo-network