diff --git a/.github/workflows/README.md b/.github/workflows/README.md index c9ecfdc..7299882 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -11,7 +11,7 @@ - to set up dependencies, run the following commands: ``` # install kubectl - sudo apt-get install -yq kubectl git + sudo apt-get install kubectl # install go curl -O https://storage.googleapis.com/golang/go1.12.9.linux-amd64.tar.gz @@ -37,11 +37,11 @@ sudo mv skaffold /usr/local/bin # install docker - sudo apt install -yq apt-transport-https ca-certificates curl gnupg2 software-properties-common && \ + sudo apt install apt-transport-https ca-certificates curl gnupg2 software-properties-common && \ curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add - && \ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" && \ - sudo apt-get update && \ - sudo apt-get install -yq docker-ce && \ + sudo apt update && \ + sudo apt install docker-ce && \ sudo usermod -aG docker ${USER} # logout and back on diff --git a/docs/img/architecture-diagram.png b/docs/img/architecture-diagram.png index c95d84b..bfea3b8 100644 Binary files a/docs/img/architecture-diagram.png and b/docs/img/architecture-diagram.png differ diff --git a/docs/img/online-boutique-frontend-1.png b/docs/img/online-boutique-frontend-1.png index 8ea6e89..a61cb3d 100644 Binary files a/docs/img/online-boutique-frontend-1.png and b/docs/img/online-boutique-frontend-1.png differ diff --git a/docs/img/online-boutique-frontend-2.png b/docs/img/online-boutique-frontend-2.png index 009ae34..1c4baa6 100644 Binary files a/docs/img/online-boutique-frontend-2.png and b/docs/img/online-boutique-frontend-2.png differ diff --git a/release/kubernetes-manifests.yaml b/release/kubernetes-manifests.yaml index eb29927..7b12fae 100644 --- a/release/kubernetes-manifests.yaml +++ b/release/kubernetes-manifests.yaml @@ -32,7 +32,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/emailservice:v0.2.0 + image: r.thisco.de/demo/emailservice:v0.1.4-43-ga301040 ports: - containerPort: 8080 env: @@ -86,7 +86,7 @@ spec: spec: containers: - name: server - image: gcr.io/google-samples/microservices-demo/checkoutservice:v0.2.0 + image: r.thisco.de/demo/checkoutservice:v0.1.4-43-ga301040 ports: - containerPort: 5050 readinessProbe: @@ -155,7 +155,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/recommendationservice:v0.2.0 + image: r.thisco.de/demo/recommendationservice:v0.1.4-43-ga301040 ports: - containerPort: 8080 readinessProbe: @@ -215,7 +215,7 @@ spec: spec: containers: - name: server - image: gcr.io/google-samples/microservices-demo/frontend:v0.2.0 + image: r.thisco.de/demo/frontend:v0.1.4-43-ga301040-dirty ports: - containerPort: 8080 readinessProbe: @@ -309,7 +309,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/paymentservice:v0.2.0 + image: r.thisco.de/demo/paymentservice:v0.1.4-43-ga301040 ports: - containerPort: 50051 env: @@ -358,7 +358,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/productcatalogservice:v0.2.0 + image: r.thisco.de/demo/productcatalogservice:v0.1.4-43-ga301040 ports: - containerPort: 3550 env: @@ -415,7 +415,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/cartservice:v0.2.0 + image: r.thisco.de/demo/cartservice:v0.1.4-43-ga301040 ports: - containerPort: 7070 env: @@ -505,7 +505,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/currencyservice:v0.2.0 + image: r.thisco.de/demo/currencyservice:v0.1.4-43-ga301040 ports: - name: grpc containerPort: 7000 @@ -560,7 +560,7 @@ spec: spec: containers: - name: server - image: gcr.io/google-samples/microservices-demo/shippingservice:v0.2.0 + image: r.thisco.de/demo/shippingservice:v0.1.4-43-ga301040 ports: - containerPort: 50051 env: diff --git a/src/frontend/handlers.go b/src/frontend/handlers.go index 751543f..e7d39e1 100644 --- a/src/frontend/handlers.go +++ b/src/frontend/handlers.go @@ -111,9 +111,12 @@ func (plat *platformDetails) setPlatformDetails(env string) { } else if env == "azure" { plat.provider = "Azure" plat.css = "azure-platform" - } else { + } else if env == "gcp" { plat.provider = "Google Cloud" plat.css = "gcp-platform" + } else { + plat.provider = "Kinvolk" + plat.css = "gcp-platform" } } diff --git a/src/frontend/static/icons/Hipster_Advert2.svg b/src/frontend/static/icons/Hipster_Advert2.svg index 6c32d48..94f5663 100755 --- a/src/frontend/static/icons/Hipster_Advert2.svg +++ b/src/frontend/static/icons/Hipster_Advert2.svg @@ -1,40 +1 @@ - - - - - Hipster - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_CartIcon.svg b/src/frontend/static/icons/Hipster_CartIcon.svg index 3f80cff..fc6d1dd 100755 --- a/src/frontend/static/icons/Hipster_CartIcon.svg +++ b/src/frontend/static/icons/Hipster_CartIcon.svg @@ -1,14 +1 @@ - - - - - Hipster - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_CheckOutIcon.svg b/src/frontend/static/icons/Hipster_CheckOutIcon.svg index 3fef436..cd0faa1 100755 --- a/src/frontend/static/icons/Hipster_CheckOutIcon.svg +++ b/src/frontend/static/icons/Hipster_CheckOutIcon.svg @@ -1,14 +1 @@ - - - - - Hipster - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_CurrencyIcon.svg b/src/frontend/static/icons/Hipster_CurrencyIcon.svg index 58ba998..0519717 100755 --- a/src/frontend/static/icons/Hipster_CurrencyIcon.svg +++ b/src/frontend/static/icons/Hipster_CurrencyIcon.svg @@ -1,14 +1 @@ - - - - - Hipster - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_DownArrow.svg b/src/frontend/static/icons/Hipster_DownArrow.svg index 0c7cd19..f32e8b6 100755 --- a/src/frontend/static/icons/Hipster_DownArrow.svg +++ b/src/frontend/static/icons/Hipster_DownArrow.svg @@ -1,11 +1 @@ - - - - - Hipster - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_FacebookIcon.svg b/src/frontend/static/icons/Hipster_FacebookIcon.svg index 988ce79..41093ad 100755 --- a/src/frontend/static/icons/Hipster_FacebookIcon.svg +++ b/src/frontend/static/icons/Hipster_FacebookIcon.svg @@ -1,14 +1 @@ - - - - - Hipster - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_GooglePlayIcon.svg b/src/frontend/static/icons/Hipster_GooglePlayIcon.svg index 71ebf78..128e761 100755 --- a/src/frontend/static/icons/Hipster_GooglePlayIcon.svg +++ b/src/frontend/static/icons/Hipster_GooglePlayIcon.svg @@ -1,98 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Hipster - - - - - - - - - - - - - - - - - - - - - - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_HelpIcon.svg b/src/frontend/static/icons/Hipster_HelpIcon.svg index cb17349..3d50868 100755 --- a/src/frontend/static/icons/Hipster_HelpIcon.svg +++ b/src/frontend/static/icons/Hipster_HelpIcon.svg @@ -1,14 +1 @@ - - - - - Hipster - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_HeroLogo.svg b/src/frontend/static/icons/Hipster_HeroLogo.svg index b275f29..203d4c1 100755 --- a/src/frontend/static/icons/Hipster_HeroLogo.svg +++ b/src/frontend/static/icons/Hipster_HeroLogo.svg @@ -1,55 +1 @@ - - - - - Hipster - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_HeroLogoCyan.svg b/src/frontend/static/icons/Hipster_HeroLogoCyan.svg index 523cb58..35d343b 100755 --- a/src/frontend/static/icons/Hipster_HeroLogoCyan.svg +++ b/src/frontend/static/icons/Hipster_HeroLogoCyan.svg @@ -1,55 +1 @@ - - - - - Hipster - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_HotProducts.svg b/src/frontend/static/icons/Hipster_HotProducts.svg index b1b7ae5..a70be85 100755 --- a/src/frontend/static/icons/Hipster_HotProducts.svg +++ b/src/frontend/static/icons/Hipster_HotProducts.svg @@ -1,28 +1 @@ - - Hipster - - - - - - - - - - - - - - - - - - - - - - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_InstagramIcon.svg b/src/frontend/static/icons/Hipster_InstagramIcon.svg index 73653f4..1927fb4 100755 --- a/src/frontend/static/icons/Hipster_InstagramIcon.svg +++ b/src/frontend/static/icons/Hipster_InstagramIcon.svg @@ -1,15 +1 @@ - - - - - Hipster - - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_KitchenwareOffer.svg b/src/frontend/static/icons/Hipster_KitchenwareOffer.svg index 827a851..4f5a3db 100755 --- a/src/frontend/static/icons/Hipster_KitchenwareOffer.svg +++ b/src/frontend/static/icons/Hipster_KitchenwareOffer.svg @@ -1,36 +1 @@ - - Hipster - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_NavLogo.svg b/src/frontend/static/icons/Hipster_NavLogo.svg index c566913..68d66f1 100755 --- a/src/frontend/static/icons/Hipster_NavLogo.svg +++ b/src/frontend/static/icons/Hipster_NavLogo.svg @@ -1,36 +1 @@ - - - - - Hipster - - - - - - - - - - - - - - - - - - - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_OtherProducts.svg b/src/frontend/static/icons/Hipster_OtherProducts.svg index dbe320a..540d6ef 100755 --- a/src/frontend/static/icons/Hipster_OtherProducts.svg +++ b/src/frontend/static/icons/Hipster_OtherProducts.svg @@ -1,36 +1 @@ - - Hipster - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_PinterestIcon.svg b/src/frontend/static/icons/Hipster_PinterestIcon.svg index 08714df..e24bfd7 100755 --- a/src/frontend/static/icons/Hipster_PinterestIcon.svg +++ b/src/frontend/static/icons/Hipster_PinterestIcon.svg @@ -1,14 +1 @@ - - - - - Hipster - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_ProfileIcon.svg b/src/frontend/static/icons/Hipster_ProfileIcon.svg index 3dc87e4..7d043a7 100755 --- a/src/frontend/static/icons/Hipster_ProfileIcon.svg +++ b/src/frontend/static/icons/Hipster_ProfileIcon.svg @@ -1,14 +1 @@ - - - - - Hipster - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_SearchIcon.svg b/src/frontend/static/icons/Hipster_SearchIcon.svg index 583f959..36f894d 100755 --- a/src/frontend/static/icons/Hipster_SearchIcon.svg +++ b/src/frontend/static/icons/Hipster_SearchIcon.svg @@ -1,11 +1 @@ - - - - - Hipster - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_TwitterIcon.svg b/src/frontend/static/icons/Hipster_TwitterIcon.svg index 8a4ff80..276b3c6 100755 --- a/src/frontend/static/icons/Hipster_TwitterIcon.svg +++ b/src/frontend/static/icons/Hipster_TwitterIcon.svg @@ -1,11 +1 @@ - - - - - Hipster - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/icons/Hipster_YoutubeIcon.svg b/src/frontend/static/icons/Hipster_YoutubeIcon.svg index edfe961..3d018e3 100755 --- a/src/frontend/static/icons/Hipster_YoutubeIcon.svg +++ b/src/frontend/static/icons/Hipster_YoutubeIcon.svg @@ -1,15 +1 @@ - - - - - Hipster - - - - - - +Hipster \ No newline at end of file diff --git a/src/frontend/static/images/Advert2BannerImage.png b/src/frontend/static/images/Advert2BannerImage.png old mode 100755 new mode 100644 index 5754a0e..ae01275 Binary files a/src/frontend/static/images/Advert2BannerImage.png and b/src/frontend/static/images/Advert2BannerImage.png differ diff --git a/src/frontend/static/images/AdvertBannerImage.png b/src/frontend/static/images/AdvertBannerImage.png old mode 100755 new mode 100644 index 7d32353..c0b5b3a Binary files a/src/frontend/static/images/AdvertBannerImage.png and b/src/frontend/static/images/AdvertBannerImage.png differ diff --git a/src/frontend/static/images/HeroBannerImage.png b/src/frontend/static/images/HeroBannerImage.png old mode 100755 new mode 100644 index b05df63..69e9a34 Binary files a/src/frontend/static/images/HeroBannerImage.png and b/src/frontend/static/images/HeroBannerImage.png differ diff --git a/src/frontend/static/images/VRHeadsets.png b/src/frontend/static/images/VRHeadsets.png old mode 100755 new mode 100644 index ed4491a..dc9a9f3 Binary files a/src/frontend/static/images/VRHeadsets.png and b/src/frontend/static/images/VRHeadsets.png differ diff --git a/src/frontend/static/img/products/air-plant.jpg b/src/frontend/static/img/products/air-plant.jpg index ac05101..c06c33c 100644 Binary files a/src/frontend/static/img/products/air-plant.jpg and b/src/frontend/static/img/products/air-plant.jpg differ diff --git a/src/frontend/static/img/products/barista-kit.jpg b/src/frontend/static/img/products/barista-kit.jpg index cebcfd6..cb56d68 100644 Binary files a/src/frontend/static/img/products/barista-kit.jpg and b/src/frontend/static/img/products/barista-kit.jpg differ diff --git a/src/frontend/static/img/products/camera-lens.jpg b/src/frontend/static/img/products/camera-lens.jpg index 63746b1..a336ed4 100644 Binary files a/src/frontend/static/img/products/camera-lens.jpg and b/src/frontend/static/img/products/camera-lens.jpg differ diff --git a/src/frontend/static/img/products/city-bike.jpg b/src/frontend/static/img/products/city-bike.jpg index 74102eb..04ff333 100644 Binary files a/src/frontend/static/img/products/city-bike.jpg and b/src/frontend/static/img/products/city-bike.jpg differ diff --git a/src/frontend/static/img/products/film-camera.jpg b/src/frontend/static/img/products/film-camera.jpg index 9d78c3f..70c49a8 100644 Binary files a/src/frontend/static/img/products/film-camera.jpg and b/src/frontend/static/img/products/film-camera.jpg differ diff --git a/src/frontend/static/img/products/record-player.jpg b/src/frontend/static/img/products/record-player.jpg index e175088..230063b 100644 Binary files a/src/frontend/static/img/products/record-player.jpg and b/src/frontend/static/img/products/record-player.jpg differ diff --git a/src/frontend/static/img/products/terrarium.jpg b/src/frontend/static/img/products/terrarium.jpg index 84ee200..6056533 100644 Binary files a/src/frontend/static/img/products/terrarium.jpg and b/src/frontend/static/img/products/terrarium.jpg differ diff --git a/src/frontend/static/img/products/typewriter.jpg b/src/frontend/static/img/products/typewriter.jpg index 127527b..c92992f 100644 Binary files a/src/frontend/static/img/products/typewriter.jpg and b/src/frontend/static/img/products/typewriter.jpg differ