diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 7299882..c9ecfdc 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 kubectl + sudo apt-get install -yq kubectl git # 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 apt-transport-https ca-certificates curl gnupg2 software-properties-common && \ + sudo apt install -yq 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 update && \ - sudo apt install docker-ce && \ + sudo apt-get update && \ + sudo apt-get install -yq 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 bfea3b8..c95d84b 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 a61cb3d..8ea6e89 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 1c4baa6..009ae34 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 7b12fae..eb29927 100644 --- a/release/kubernetes-manifests.yaml +++ b/release/kubernetes-manifests.yaml @@ -32,7 +32,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: r.thisco.de/demo/emailservice:v0.1.4-43-ga301040 + image: gcr.io/google-samples/microservices-demo/emailservice:v0.2.0 ports: - containerPort: 8080 env: @@ -86,7 +86,7 @@ spec: spec: containers: - name: server - image: r.thisco.de/demo/checkoutservice:v0.1.4-43-ga301040 + image: gcr.io/google-samples/microservices-demo/checkoutservice:v0.2.0 ports: - containerPort: 5050 readinessProbe: @@ -155,7 +155,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: r.thisco.de/demo/recommendationservice:v0.1.4-43-ga301040 + image: gcr.io/google-samples/microservices-demo/recommendationservice:v0.2.0 ports: - containerPort: 8080 readinessProbe: @@ -215,7 +215,7 @@ spec: spec: containers: - name: server - image: r.thisco.de/demo/frontend:v0.1.4-43-ga301040-dirty + image: gcr.io/google-samples/microservices-demo/frontend:v0.2.0 ports: - containerPort: 8080 readinessProbe: @@ -309,7 +309,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: r.thisco.de/demo/paymentservice:v0.1.4-43-ga301040 + image: gcr.io/google-samples/microservices-demo/paymentservice:v0.2.0 ports: - containerPort: 50051 env: @@ -358,7 +358,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: r.thisco.de/demo/productcatalogservice:v0.1.4-43-ga301040 + image: gcr.io/google-samples/microservices-demo/productcatalogservice:v0.2.0 ports: - containerPort: 3550 env: @@ -415,7 +415,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: r.thisco.de/demo/cartservice:v0.1.4-43-ga301040 + image: gcr.io/google-samples/microservices-demo/cartservice:v0.2.0 ports: - containerPort: 7070 env: @@ -505,7 +505,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: r.thisco.de/demo/currencyservice:v0.1.4-43-ga301040 + image: gcr.io/google-samples/microservices-demo/currencyservice:v0.2.0 ports: - name: grpc containerPort: 7000 @@ -560,7 +560,7 @@ spec: spec: containers: - name: server - image: r.thisco.de/demo/shippingservice:v0.1.4-43-ga301040 + image: gcr.io/google-samples/microservices-demo/shippingservice:v0.2.0 ports: - containerPort: 50051 env: diff --git a/src/frontend/handlers.go b/src/frontend/handlers.go index e7d39e1..751543f 100644 --- a/src/frontend/handlers.go +++ b/src/frontend/handlers.go @@ -111,11 +111,8 @@ func (plat *platformDetails) setPlatformDetails(env string) { } else if env == "azure" { plat.provider = "Azure" plat.css = "azure-platform" - } else if env == "gcp" { - plat.provider = "Google Cloud" - plat.css = "gcp-platform" } else { - plat.provider = "Kinvolk" + plat.provider = "Google Cloud" plat.css = "gcp-platform" } } diff --git a/src/frontend/static/icons/Hipster_Advert2.svg b/src/frontend/static/icons/Hipster_Advert2.svg index 94f5663..6c32d48 100755 --- a/src/frontend/static/icons/Hipster_Advert2.svg +++ b/src/frontend/static/icons/Hipster_Advert2.svg @@ -1 +1,40 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/frontend/static/icons/Hipster_CartIcon.svg b/src/frontend/static/icons/Hipster_CartIcon.svg index fc6d1dd..3f80cff 100755 --- a/src/frontend/static/icons/Hipster_CartIcon.svg +++ b/src/frontend/static/icons/Hipster_CartIcon.svg @@ -1 +1,14 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + diff --git a/src/frontend/static/icons/Hipster_CheckOutIcon.svg b/src/frontend/static/icons/Hipster_CheckOutIcon.svg index cd0faa1..3fef436 100755 --- a/src/frontend/static/icons/Hipster_CheckOutIcon.svg +++ b/src/frontend/static/icons/Hipster_CheckOutIcon.svg @@ -1 +1,14 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + diff --git a/src/frontend/static/icons/Hipster_CurrencyIcon.svg b/src/frontend/static/icons/Hipster_CurrencyIcon.svg index 0519717..58ba998 100755 --- a/src/frontend/static/icons/Hipster_CurrencyIcon.svg +++ b/src/frontend/static/icons/Hipster_CurrencyIcon.svg @@ -1 +1,14 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + diff --git a/src/frontend/static/icons/Hipster_DownArrow.svg b/src/frontend/static/icons/Hipster_DownArrow.svg index f32e8b6..0c7cd19 100755 --- a/src/frontend/static/icons/Hipster_DownArrow.svg +++ b/src/frontend/static/icons/Hipster_DownArrow.svg @@ -1 +1,11 @@ -Hipster \ No newline at end of file + + + + + Hipster + + diff --git a/src/frontend/static/icons/Hipster_FacebookIcon.svg b/src/frontend/static/icons/Hipster_FacebookIcon.svg index 41093ad..988ce79 100755 --- a/src/frontend/static/icons/Hipster_FacebookIcon.svg +++ b/src/frontend/static/icons/Hipster_FacebookIcon.svg @@ -1 +1,14 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + diff --git a/src/frontend/static/icons/Hipster_GooglePlayIcon.svg b/src/frontend/static/icons/Hipster_GooglePlayIcon.svg index 128e761..71ebf78 100755 --- a/src/frontend/static/icons/Hipster_GooglePlayIcon.svg +++ b/src/frontend/static/icons/Hipster_GooglePlayIcon.svg @@ -1 +1,98 @@ -Hipster \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Hipster + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/frontend/static/icons/Hipster_HelpIcon.svg b/src/frontend/static/icons/Hipster_HelpIcon.svg index 3d50868..cb17349 100755 --- a/src/frontend/static/icons/Hipster_HelpIcon.svg +++ b/src/frontend/static/icons/Hipster_HelpIcon.svg @@ -1 +1,14 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + diff --git a/src/frontend/static/icons/Hipster_HeroLogo.svg b/src/frontend/static/icons/Hipster_HeroLogo.svg index 203d4c1..b275f29 100755 --- a/src/frontend/static/icons/Hipster_HeroLogo.svg +++ b/src/frontend/static/icons/Hipster_HeroLogo.svg @@ -1 +1,55 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/frontend/static/icons/Hipster_HeroLogoCyan.svg b/src/frontend/static/icons/Hipster_HeroLogoCyan.svg index 35d343b..523cb58 100755 --- a/src/frontend/static/icons/Hipster_HeroLogoCyan.svg +++ b/src/frontend/static/icons/Hipster_HeroLogoCyan.svg @@ -1 +1,55 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/frontend/static/icons/Hipster_HotProducts.svg b/src/frontend/static/icons/Hipster_HotProducts.svg index a70be85..b1b7ae5 100755 --- a/src/frontend/static/icons/Hipster_HotProducts.svg +++ b/src/frontend/static/icons/Hipster_HotProducts.svg @@ -1 +1,28 @@ -Hipster \ No newline at end of file + + Hipster + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/frontend/static/icons/Hipster_InstagramIcon.svg b/src/frontend/static/icons/Hipster_InstagramIcon.svg index 1927fb4..73653f4 100755 --- a/src/frontend/static/icons/Hipster_InstagramIcon.svg +++ b/src/frontend/static/icons/Hipster_InstagramIcon.svg @@ -1 +1,15 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + + diff --git a/src/frontend/static/icons/Hipster_KitchenwareOffer.svg b/src/frontend/static/icons/Hipster_KitchenwareOffer.svg index 4f5a3db..827a851 100755 --- a/src/frontend/static/icons/Hipster_KitchenwareOffer.svg +++ b/src/frontend/static/icons/Hipster_KitchenwareOffer.svg @@ -1 +1,36 @@ -Hipster \ No newline at end of file + + Hipster + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/frontend/static/icons/Hipster_NavLogo.svg b/src/frontend/static/icons/Hipster_NavLogo.svg index 68d66f1..c566913 100755 --- a/src/frontend/static/icons/Hipster_NavLogo.svg +++ b/src/frontend/static/icons/Hipster_NavLogo.svg @@ -1 +1,36 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/frontend/static/icons/Hipster_OtherProducts.svg b/src/frontend/static/icons/Hipster_OtherProducts.svg index 540d6ef..dbe320a 100755 --- a/src/frontend/static/icons/Hipster_OtherProducts.svg +++ b/src/frontend/static/icons/Hipster_OtherProducts.svg @@ -1 +1,36 @@ -Hipster \ No newline at end of file + + Hipster + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/frontend/static/icons/Hipster_PinterestIcon.svg b/src/frontend/static/icons/Hipster_PinterestIcon.svg index e24bfd7..08714df 100755 --- a/src/frontend/static/icons/Hipster_PinterestIcon.svg +++ b/src/frontend/static/icons/Hipster_PinterestIcon.svg @@ -1 +1,14 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + diff --git a/src/frontend/static/icons/Hipster_ProfileIcon.svg b/src/frontend/static/icons/Hipster_ProfileIcon.svg index 7d043a7..3dc87e4 100755 --- a/src/frontend/static/icons/Hipster_ProfileIcon.svg +++ b/src/frontend/static/icons/Hipster_ProfileIcon.svg @@ -1 +1,14 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + diff --git a/src/frontend/static/icons/Hipster_SearchIcon.svg b/src/frontend/static/icons/Hipster_SearchIcon.svg index 36f894d..583f959 100755 --- a/src/frontend/static/icons/Hipster_SearchIcon.svg +++ b/src/frontend/static/icons/Hipster_SearchIcon.svg @@ -1 +1,11 @@ -Hipster \ No newline at end of file + + + + + Hipster + + diff --git a/src/frontend/static/icons/Hipster_TwitterIcon.svg b/src/frontend/static/icons/Hipster_TwitterIcon.svg index 276b3c6..8a4ff80 100755 --- a/src/frontend/static/icons/Hipster_TwitterIcon.svg +++ b/src/frontend/static/icons/Hipster_TwitterIcon.svg @@ -1 +1,11 @@ -Hipster \ No newline at end of file + + + + + Hipster + + diff --git a/src/frontend/static/icons/Hipster_YoutubeIcon.svg b/src/frontend/static/icons/Hipster_YoutubeIcon.svg index 3d018e3..edfe961 100755 --- a/src/frontend/static/icons/Hipster_YoutubeIcon.svg +++ b/src/frontend/static/icons/Hipster_YoutubeIcon.svg @@ -1 +1,15 @@ -Hipster \ No newline at end of file + + + + + Hipster + + + + + + diff --git a/src/frontend/static/images/Advert2BannerImage.png b/src/frontend/static/images/Advert2BannerImage.png old mode 100644 new mode 100755 index ae01275..5754a0e 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 100644 new mode 100755 index c0b5b3a..7d32353 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 100644 new mode 100755 index 69e9a34..b05df63 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 100644 new mode 100755 index dc9a9f3..ed4491a 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 c06c33c..ac05101 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 cb56d68..cebcfd6 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 a336ed4..63746b1 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 04ff333..74102eb 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 70c49a8..9d78c3f 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 230063b..e175088 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 6056533..84ee200 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 c92992f..127527b 100644 Binary files a/src/frontend/static/img/products/typewriter.jpg and b/src/frontend/static/img/products/typewriter.jpg differ