Merge pull request 'docker-compose lokal gebaute Images' (#43 ) from feature-docker-local into main

Reviewed-on: #43
switch docker-compose to local build
2021-08-02 18:02:26 +02:00 · 2021-07-28 22:28:34 +02:00
2 changed files with 14 additions and 6 deletions
--- a/README.md
+++ b/README.md
@ -179,8 +179,16 @@ Für die Produktionsumgebung wird [waitress](https://docs.pylonsproject.org/proj

 ## Integrationsumgebung

-Per [`docker-compose`](https://docs.docker.com/compose/) kann eine Integrationsumgebung
-mit den neusten Ständen der Docker Images gestartet werden:
+Per [`docker-compose`](https://docs.docker.com/compose/) kann eine Integrationsumgebung gestartet werden.  
+Beide Projekte müssen nebeneinander ausgecheckt sein:
+
+```
+./
+  ki-backend
+  ki-frontend
+```
+
+Alles starten:

 ```
 docker-compose up
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -6,7 +6,7 @@ version: "3"

 services:
  ki_backend:
-    image: registry.wtf-eg.net/ki-backend:latest
+    build: .
    restart: "no"
    ports:
      - "13338:5000"
@ -14,9 +14,9 @@ services:
      - "./env.dev:/app/.env"

  ki_frontend:
-    image: registry.wtf-eg.net/ki-frontend:latest
+    build: ./../ki-frontend
    restart: "no"
    ports:
      - "13337:80"
-    environment:
-      VUE_APP_API_URL: http://localhost:13338
+    volumes:
+      - "../ki-frontend/public/config.js.int:/user/share/nginx/html/config.js"
Author	SHA1	Message	Date
weeman	922b20c990	Merge pull request 'docker-compose lokal gebaute Images' (#43 ) from feature-docker-local into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #43	2021-08-02 18:02:26 +02:00
Michael Weimann	5a84ba0689	switch docker-compose to local build All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2021-07-28 22:28:34 +02:00