diff --git a/README.md b/README.md index 01cdd1e..a594c82 100644 --- a/README.md +++ b/README.md @@ -49,13 +49,7 @@ for that. Additionally monitoring must ensure that bottlenecks can be detected e * Follow the steps [described here](./infrastructure/README.md) in order to prepare minikube and hosts. -* Run `eval $(minikube docker-env)` in order to connect minikube with a local docker. - - -* Run `./build-docker-images.sh` from root and wait that API and Web app are dockerized. - - -* Go into `terraform` folder and run `./install`. This will run terraform and install all the components to Minikube. +* Go into `infrastructure/terraform` folder and run `./install`. This will run terraform and install all the components to Minikube. * Front end of the application can be accessed at http://conference.frontend @@ -121,7 +115,6 @@ Seed test data with: ├─ infrastructure/ # Infrastructuree of the application | ├─ docker-compose.yaml # Config to run app in local docker container -├─ build-docler-images.sh # Build Api and Web docker images from the root folder ├─ .gitignore # List of files and folders not tracked by Git └─ README.md # This file ``` diff --git a/build-docker-images.sh b/build-docker-images.sh deleted file mode 100755 index dacf88b..0000000 --- a/build-docker-images.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -function buildImages() { - for d in ./api/ ./client/ ; do /bin/zsh -c "(cd "$d" && npm run docker:build)"; done -} - -buildImages "ls -al" \ No newline at end of file diff --git a/infrastructure/README.md b/infrastructure/README.md index a08b780..08b9886 100644 --- a/infrastructure/README.md +++ b/infrastructure/README.md @@ -36,7 +36,6 @@ for that. Additionally monitoring must ensure that bottlenecks can be detected e minikube addons enable ingress minikube addons enable dashboard - minikube addons enable freshpod minikube addons enable metrics-server ``` diff --git a/infrastructure/terraform/helm_config/backend.yaml b/infrastructure/terraform/helm_config/backend.yaml index 6f2a4a7..75e5a05 100644 --- a/infrastructure/terraform/helm_config/backend.yaml +++ b/infrastructure/terraform/helm_config/backend.yaml @@ -1,5 +1,5 @@ image: - repository: pac_mnikolic_api + repository: mnikolic/pac_mnikolic_api tag: latest envFrom: - configMapRef: diff --git a/infrastructure/terraform/helm_config/frontend.yaml b/infrastructure/terraform/helm_config/frontend.yaml index 9a16a7f..e8dd57c 100644 --- a/infrastructure/terraform/helm_config/frontend.yaml +++ b/infrastructure/terraform/helm_config/frontend.yaml @@ -1,5 +1,5 @@ image: - repository: pac_mnikolic_web + repository: mnikolic/pac_mnikolic_web tag: latest envFrom: - configMapRef: