moved some files, updated docker compose

orbitalapi · Aug 29, 2024 · fc2b1b6 · fc2b1b6
1 parent ac564ec
commit fc2b1b6
Show file tree

Hide file tree

Showing 39 changed files with 19 additions and 52 deletions.
diff --git a/composing-apis-and-db/docker-compose.yml b/composing-apis-and-db/docker-compose.yml
@@ -18,13 +18,13 @@ services:
             --vyne.db.username=orbital
             --vyne.db.password=changeme
             --vyne.db.host=postgres
-            --vyne.workspace.project-file=/opt/service/workspace/taxi.conf
+            --vyne.workspace.config-file=/opt/service/workspace/workspace.conf
       ports:
          - "9022:9022" # http
          - "7655:7655" # rsocket
       volumes:
          - ~/.orbital/license/:/opt/var/vyne/license/
-         - ./taxi:/opt/service/workspace
+         - ./workspace:/opt/service/workspace
       depends_on:
          - postgres
       deploy:

diff --git a/composing-apis-and-db/taxi/orbital/config/connections.conf b/composing-apis-and-db/taxi/orbital/config/connections.conf
diff --git a/composing-apis-and-db/services/.dockerignore → ...s-and-db/workspace/services/.dockerignore b/composing-apis-and-db/services/.dockerignore → ...s-and-db/workspace/services/.dockerignore
diff --git a/composing-apis-and-db/services/api-docs.yaml → ...s-and-db/workspace/services/api-docs.yaml b/composing-apis-and-db/services/api-docs.yaml → ...s-and-db/workspace/services/api-docs.yaml
diff --git a/composing-apis-and-db/services/pom.xml → ...ng-apis-and-db/workspace/services/pom.xml b/composing-apis-and-db/services/pom.xml → ...ng-apis-and-db/workspace/services/pom.xml
diff --git a/...ices/src/main/java/com/petflix/DemoApp.kt → ...ices/src/main/java/com/petflix/DemoApp.kt b/...ices/src/main/java/com/petflix/DemoApp.kt → ...ices/src/main/java/com/petflix/DemoApp.kt
diff --git a/...ava/com/petflix/lookup/IdLookupService.kt → ...ava/com/petflix/lookup/IdLookupService.kt b/...ava/com/petflix/lookup/IdLookupService.kt → ...ava/com/petflix/lookup/IdLookupService.kt
diff --git a/...ava/com/petflix/reviews/ReviewsService.kt → ...ava/com/petflix/reviews/ReviewsService.kt b/...ava/com/petflix/reviews/ReviewsService.kt → ...ava/com/petflix/reviews/ReviewsService.kt
diff --git a/...lix/watching/WhereCanIWatchThisService.kt → ...lix/watching/WhereCanIWatchThisService.kt b/...lix/watching/WhereCanIWatchThisService.kt → ...lix/watching/WhereCanIWatchThisService.kt
diff --git a/...rvices/src/main/resources/application.yml → ...rvices/src/main/resources/application.yml b/...rvices/src/main/resources/application.yml → ...rvices/src/main/resources/application.yml
diff --git a/composing-apis-and-db/taxi/.dockerignore → ...-apis-and-db/workspace/taxi/.dockerignore b/composing-apis-and-db/taxi/.dockerignore → ...-apis-and-db/workspace/taxi/.dockerignore
diff --git a/composing-apis-and-db/taxi/.gitignore → ...ing-apis-and-db/workspace/taxi/.gitignore b/composing-apis-and-db/taxi/.gitignore → ...ing-apis-and-db/workspace/taxi/.gitignore
diff --git a/...-apis-and-db/taxi/.vscode/extensions.json → ...db/workspace/taxi/.vscode/extensions.json b/...-apis-and-db/taxi/.vscode/extensions.json → ...db/workspace/taxi/.vscode/extensions.json
diff --git a/composing-apis-and-db/taxi/dist/pom.xml → ...g-apis-and-db/workspace/taxi/dist/pom.xml b/composing-apis-and-db/taxi/dist/pom.xml → ...g-apis-and-db/workspace/taxi/dist/pom.xml
diff --git a/.../main/java/com/petflix/demos/TypeNames.kt → .../main/java/com/petflix/demos/TypeNames.kt b/.../main/java/com/petflix/demos/TypeNames.kt → .../main/java/com/petflix/demos/TypeNames.kt
diff --git a/...c/main/java/demo/netflix/NetflixFilmId.kt → ...c/main/java/demo/netflix/NetflixFilmId.kt b/...c/main/java/demo/netflix/NetflixFilmId.kt → ...c/main/java/demo/netflix/NetflixFilmId.kt
diff --git a/...i/dist/src/main/java/films/Description.kt → ...i/dist/src/main/java/films/Description.kt b/...i/dist/src/main/java/films/Description.kt → ...i/dist/src/main/java/films/Description.kt
diff --git a/...-db/taxi/dist/src/main/java/films/Film.kt → ...ace/taxi/dist/src/main/java/films/Film.kt b/...-db/taxi/dist/src/main/java/films/Film.kt → ...ace/taxi/dist/src/main/java/films/Film.kt
diff --git a/...b/taxi/dist/src/main/java/films/FilmId.kt → ...e/taxi/dist/src/main/java/films/FilmId.kt b/...b/taxi/dist/src/main/java/films/FilmId.kt → ...e/taxi/dist/src/main/java/films/FilmId.kt
diff --git a/...b/taxi/dist/src/main/java/films/Length.kt → ...e/taxi/dist/src/main/java/films/Length.kt b/...b/taxi/dist/src/main/java/films/Length.kt → ...e/taxi/dist/src/main/java/films/Length.kt
diff --git a/...b/taxi/dist/src/main/java/films/Rating.kt → ...e/taxi/dist/src/main/java/films/Rating.kt b/...b/taxi/dist/src/main/java/films/Rating.kt → ...e/taxi/dist/src/main/java/films/Rating.kt
diff --git a/...i/dist/src/main/java/films/ReleaseYear.kt → ...i/dist/src/main/java/films/ReleaseYear.kt b/...i/dist/src/main/java/films/ReleaseYear.kt → ...i/dist/src/main/java/films/ReleaseYear.kt
diff --git a/.../main/java/films/StreamingProviderName.kt → .../main/java/films/StreamingProviderName.kt b/.../main/java/films/StreamingProviderName.kt → .../main/java/films/StreamingProviderName.kt
diff --git a/...main/java/films/StreamingProviderPrice.kt → ...main/java/films/StreamingProviderPrice.kt b/...main/java/films/StreamingProviderPrice.kt → ...main/java/films/StreamingProviderPrice.kt
diff --git a/...db/taxi/dist/src/main/java/films/Title.kt → ...ce/taxi/dist/src/main/java/films/Title.kt b/...db/taxi/dist/src/main/java/films/Title.kt → ...ce/taxi/dist/src/main/java/films/Title.kt
diff --git a/...ain/java/films/reviews/FilmReviewScore.kt → ...ain/java/films/reviews/FilmReviewScore.kt b/...ain/java/films/reviews/FilmReviewScore.kt → ...ain/java/films/reviews/FilmReviewScore.kt
diff --git a/...src/main/java/films/reviews/ReviewText.kt → ...src/main/java/films/reviews/ReviewText.kt b/...src/main/java/films/reviews/ReviewText.kt → ...src/main/java/films/reviews/ReviewText.kt
diff --git a/...a/films/reviews/SquashedTomatoesFilmId.kt → ...a/films/reviews/SquashedTomatoesFilmId.kt b/...a/films/reviews/SquashedTomatoesFilmId.kt → ...a/films/reviews/SquashedTomatoesFilmId.kt
diff --git a/...-apis-and-db/taxi/orbital/config/env.conf → ...db/workspace/taxi/orbital/config/env.conf b/...-apis-and-db/taxi/orbital/config/env.conf → ...db/workspace/taxi/orbital/config/env.conf
diff --git a/...ing-apis-and-db/taxi/src/film/FilmDb.taxi → ...nd-db/workspace/taxi/src/film/FilmDb.taxi b/...ing-apis-and-db/taxi/src/film/FilmDb.taxi → ...nd-db/workspace/taxi/src/film/FilmDb.taxi
diff --git a/...sing-apis-and-db/taxi/src/film/films.taxi → ...and-db/workspace/taxi/src/film/films.taxi b/...sing-apis-and-db/taxi/src/film/films.taxi → ...and-db/workspace/taxi/src/film/films.taxi
diff --git a/.../taxi/src/film/netflix/netflix-types.taxi → .../taxi/src/film/netflix/netflix-types.taxi b/.../taxi/src/film/netflix/netflix-types.taxi → .../taxi/src/film/netflix/netflix-types.taxi
diff --git a/...ng-apis-and-db/taxi/src/film/reviews.taxi → ...d-db/workspace/taxi/src/film/reviews.taxi b/...ng-apis-and-db/taxi/src/film/reviews.taxi → ...d-db/workspace/taxi/src/film/reviews.taxi
diff --git a/composing-apis-and-db/taxi/taxi.conf → ...sing-apis-and-db/workspace/taxi/taxi.conf b/composing-apis-and-db/taxi/taxi.conf → ...sing-apis-and-db/workspace/taxi/taxi.conf
diff --git a/composing-apis-and-db/workspace.conf → ...sing-apis-and-db/workspace/workspace.conf b/composing-apis-and-db/workspace.conf → ...sing-apis-and-db/workspace/workspace.conf
diff --git a/importing-through-ui/docker-compose.yml b/importing-through-ui/docker-compose.yml
@@ -6,51 +6,44 @@ services:
       environment:
          JAVA_OPTS: >-
             -Xms256m
-            -Xmx1024m
+            -Xmx2048m
          OPTIONS: >-
-            --vyne.services.config-file=/opt/service/config/services.conf
             --vyne.analytics.persistRemoteCallResponses=true
             --vyne.analytics.persistResults=true
+            --vyne.workspace.config-file=/opt/service/workspace/workspace.conf
+            --vyne.db.username=orbital
+            --vyne.db.password=changeme
+            --vyne.db.host=postgres
       ports:
          - "9022:9022"
       expose:
          - 9022
       volumes:
-         - ~/.orbital/license/:/opt/var/vyne/license/
-         - ./orbital/config:/opt/service/config
+         - .:/opt/service/workspace
       deploy:
          restart_policy:
             condition: on-failure
          resources:
             limits:
                memory: 2gb
 
-   schema-server:
-      image: orbitalhq/schema-server:${ORBITAL_VERSION:-latest}
-      volumes:
-         - ${SCHEMA_PATH:-./orbital/schema-server}:/var/lib/orbital/schema-server
-      environment:
-         JAVA_OPTS: >-
-            -Xms256m
-            -Xmx512m
-         OPTIONS: >-
-            --vyne.repositories.config-file=/var/lib/orbital/schema-server/schema-server.conf
-      deploy:
-         restart_policy:
-            condition: on-failure
-         resources:
-            limits:
-               memory: 1200mb
+   postgres:
+      image: postgres:15
       expose:
-         - 7655
-         - 9305
+         - 5432
+      ports:
+         - "25432:5432"
+      environment:
+         POSTGRES_DB: orbital
+         POSTGRES_USER: orbital
+         POSTGRES_PASSWORD: changeme
 
-   postgres:
+   postgres-pagila:
       image: ghcr.io/orbitalapi/demos-films-pagila:latest
       expose:
          - 5432
       ports:
-         - "25432:5432"
+         - "35432:5432"
 
    films-api:
       image: ghcr.io/orbitalapi/demos-films-ui-importing-listings-api:latest

diff --git a/importing-through-ui/docker/schema-server/projects/taxi.conf b/importing-through-ui/docker/schema-server/projects/taxi.conf
diff --git a/importing-through-ui/docker/schema-server/schema-server.conf b/importing-through-ui/docker/schema-server/schema-server.conf
diff --git a/...rting-through-ui/schema-server-local.conf → importing-through-ui/workspace.conf b/...rting-through-ui/schema-server-local.conf → importing-through-ui/workspace.conf