Directories cleanup

.gitignore

@@ -53,4 +53,4 @@ dist
 **/*.swp
 
 # keycloak mounted volume
-backend/keycloak/data/*
+scripts/keycloak/data/*

README.md

@@ -44,7 +44,7 @@ After starting up the required services, setup and run the backend.
 The backend is developed using [Python](https://www.python.org/), [FastAPI](https://fastapi.tiangolo.com/), [Motor](https://motor.readthedocs.io/en/stable/).
 
 1. Switch to backend directory `cd backend`.
-2. Install dependencies using `pipenv install`. See [pipenv](https://github.com/pypa/pipenv).
+2. Install dependencies using `pipenv install --dev`. See [pipenv](https://github.com/pypa/pipenv).
 3. Run app from command line (if you set it up in PyCharm you can use its debug functions):
     ```pipenv run uvicorn app.main:app --reload```
 4. API docs are available at `http://localhost:8000/docs`. Default API is deployed at `http://localhost:8000/api/v2`.

docker-compose.dev.yml

@@ -53,7 +53,7 @@ services:
     image: nginx:1.19.2-alpine
     hostname: nginx
     volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./docker/minio-nginx.conf:/etc/nginx/nginx.conf:ro
     ports:
       - "9000:9000"
       - "9001:9001"
@@ -75,8 +75,8 @@ services:
   keycloak:
       image: quay.io/keycloak/keycloak:latest
       volumes:
-        - ./backend/keycloak/clowder-realm-dev.json:/opt/keycloak/data/import/realm.json:ro
-        - ./backend/keycloak/clowder-theme/:/opt/keycloak/themes/clowder-theme/:ro
+        - ./scripts/keycloak/clowder-realm-dev.json:/opt/keycloak/data/import/realm.json:ro
+        - ./scripts/keycloak/clowder-theme/:/opt/keycloak/themes/clowder-theme/:ro
       command:
         - start-dev
         - --http-relative-path /keycloak

docker-compose.yml

@@ -39,7 +39,7 @@ services:
   backend:
     image: 'clowder/clowder2-backend'
     build:
-      context: backend
+      context: ./backend
     networks:
       - clowder2
     environment:
@@ -66,7 +66,7 @@ services:
   frontend:
     image: "clowder/clowder2-frontend"
     build:
-      context: frontend
+      context: ./frontend
     networks:
       - clowder2
     depends_on:
@@ -120,7 +120,7 @@ services:
     networks:
       - clowder2
     volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./docker/minio-nginx.conf:/etc/nginx/nginx.conf:ro
     depends_on:
       - minio1
       - minio2
@@ -139,12 +139,12 @@ services:
         POSTGRES_PASSWORD: password
 
   keycloak:
-      image: quay.io/keycloak/keycloak:latest
+      image: quay.io/keycloak/keycloak:19.0.2
       networks:
         - clowder2
       volumes:
-        - ./backend/keycloak/clowder-realm-prod.json:/opt/keycloak/data/import/realm.json:ro
-        - ./backend/keycloak/clowder-theme/:/opt/keycloak/themes/clowder-theme/:ro
+        - ./scripts/keycloak/clowder-realm-prod.json:/opt/keycloak/data/import/realm.json:ro
+        - ./scripts/keycloak/clowder-theme/:/opt/keycloak/themes/clowder-theme/:ro
       command:
         - start-dev
         - --http-relative-path /keycloak