From a0cc29c9425d6fe0aa06f7bbc7a5a4dbad3fbacb Mon Sep 17 00:00:00 2001 From: UdayVarkhedkar Date: Thu, 4 Mar 2021 20:19:51 -0500 Subject: [PATCH] [ENG-2518] Removes registries container (#9596) * Removes registries container from docker-compose and corresponding readme * Incorporates Corbin's changes detailing enabling the Collections container --- README-docker-compose.md | 10 +++++++--- docker-compose.yml | 32 ++------------------------------ 2 files changed, 9 insertions(+), 33 deletions(-) diff --git a/README-docker-compose.md b/README-docker-compose.md index 1026340dd7b..caf025d005f 100644 --- a/README-docker-compose.md +++ b/README-docker-compose.md @@ -122,8 +122,8 @@ - `$ docker-compose up -d mfr wb fakecas sharejs` 5. Run migrations and create preprint providers - When starting with an empty database you will need to run migrations and populate preprint providers. See the [Running arbitrary commands](#running-arbitrary-commands) section below for instructions. -6. Start the OSF Web, API Server, Preprints, and Registries (Detached) - - `$ docker-compose up -d worker web api admin preprints registries ember_osf_web` +6. Start the OSF Web, API Server, and Preprints (Detached) + - `$ docker-compose up -d worker web api admin preprints ember_osf_web` 7. View the OSF at [http://localhost:5000](http://localhost:5000). @@ -132,7 +132,7 @@ - Once the requirements have all been installed, you can start the OSF in the background with ```bash - $ docker-compose up -d assets admin_assets mfr wb fakecas sharejs worker web api admin preprints registries ember_osf_web + $ docker-compose up -d assets admin_assets mfr wb fakecas sharejs worker web api admin preprints ember_osf_web ``` - To view the logs for a given container: @@ -343,3 +343,7 @@ wb: - wb_tmp_vol:/tmp stdin_open: true ``` + +### Running Collections + +To run collections, you must uncomment COLLECTIONS_ENABLED=true in docker-compose.yml under ember_osf_web, then recreate your ember and web containers. \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index d25b2f08e44..dabb01dd0d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,8 +17,6 @@ volumes: external: false preprints_dist_vol: external: false - registries_dist_vol: - external: false reviews_dist_vol: external: false mfr_requirements_vol: @@ -263,6 +261,8 @@ services: - api - web environment: + # Uncomment below to enable collections on ember + # - COLLECTIONS_ENABLED=true - BACKEND=local expose: - 4200 @@ -302,33 +302,6 @@ services: - preprints_dist_vol:/code/dist stdin_open: true - ############## - # Registries # - ############## - - registries: - image: quay.io/centerforopenscience/osf-registries:develop-local - command: - - /bin/bash - - -c - - yarn --frozen-lockfile && - yarn start --host 0.0.0.0 --port 4202 --live-reload-port 41955 - restart: unless-stopped - depends_on: - - api - - web - environment: - - BACKEND=local - expose: - - 4202 - - 41955 - ports: - - 4202:4202 - - 41955:41955 - volumes: - - registries_dist_vol:/code/dist - stdin_open: true - ########### # Reviews # ########### @@ -527,6 +500,5 @@ services: - osf_node_modules_vol:/code/node_modules - ember_osf_web_dist_vol:/ember_osf_web - preprints_dist_vol:/preprints - - registries_dist_vol:/registries - reviews_dist_vol:/reviews stdin_open: true