diff --git a/deployments/localdevelopment/setupdevenv.sh b/deployments/localdevelopment/setupdevenv.sh index 4ad9c29..5cd3e9e 100644 --- a/deployments/localdevelopment/setupdevenv.sh +++ b/deployments/localdevelopment/setupdevenv.sh @@ -4,7 +4,7 @@ # workstation requirements: git, Docker, Ruby (with proper libraries/gems), angular@CLI docker run --name redis -p 6379:6379 -d redis:4.0.2 -docker run --name postgres -p 5432:5432 -d mreferre/yelb-db:0.3 +docker run --name postgres -p 5432:5432 -d mreferre/yelb-db:0.5 cd ./yelb/yelb-appserver export RACK_ENV=development diff --git a/deployments/localtest/README.md b/deployments/localtest/README.md index 86558ab..357066c 100644 --- a/deployments/localtest/README.md +++ b/deployments/localtest/README.md @@ -7,9 +7,9 @@ Move to the directory where you want to work and clone the repo: ``` docker network create yelb-network docker run --name redis-server -p 6379:6379 --network=yelb-network -d redis:4.0.2 -docker run --name yelb-db -p 5432:5432 --network=yelb-network -d mreferre/yelb-db:0.3 -docker run --name yelb-appserver --network=yelb-network -d -p 4567:4567 -e RACK_ENV=test mreferre/yelb-appserver:0.3 -docker run --name yelb-ui --network=yelb-network -d -p 8080:80 -e UI_ENV=test mreferre/yelb-ui:0.3 +docker run --name yelb-db -p 5432:5432 --network=yelb-network -d mreferre/yelb-db:0.5 +docker run --name yelb-appserver --network=yelb-network -d -p 4567:4567 -e RACK_ENV=test mreferre/yelb-appserver:0.5 +docker run --name yelb-ui --network=yelb-network -d -p 8080:80 -e UI_ENV=test mreferre/yelb-ui:0.5 ``` You should now be able to see the application running by connecting your browser to: http://localhost:8080 diff --git a/deployments/localtest/docker-compose.yaml b/deployments/localtest/docker-compose.yaml index e0982ab..602595a 100644 --- a/deployments/localtest/docker-compose.yaml +++ b/deployments/localtest/docker-compose.yaml @@ -2,7 +2,7 @@ version: "2.1" services: yelb-ui: - image: mreferre/yelb-ui:0.3 + image: mreferre/yelb-ui:0.5 depends_on: - yelb-appserver ports: @@ -11,7 +11,7 @@ services: - UI_ENV=test # dev | test | prod yelb-appserver: - image: mreferre/yelb-appserver:0.3 + image: mreferre/yelb-appserver:0.5 depends_on: - redis-server - yelb-db @@ -26,6 +26,6 @@ services: - 6379:6379 yelb-db: - image: mreferre/yelb-db:0.3 + image: mreferre/yelb-db:0.5 ports: - 5432:5432 diff --git a/deployments/platformdeployment/AWS/ECS/yelb-cloudformation-ECS-deployment.yaml b/deployments/platformdeployment/AWS/ECS/yelb-cloudformation-ECS-deployment.yaml index 284b912..0cb8867 100644 --- a/deployments/platformdeployment/AWS/ECS/yelb-cloudformation-ECS-deployment.yaml +++ b/deployments/platformdeployment/AWS/ECS/yelb-cloudformation-ECS-deployment.yaml @@ -82,7 +82,7 @@ Resources: ContainerDefinitions: - Name: yelb-db Essential: true - Image: mreferre/yelb-db:0.3 + Image: mreferre/yelb-db:0.5 LogConfiguration: LogDriver: awslogs Options: @@ -156,7 +156,7 @@ Resources: ContainerDefinitions: - Name: yelb-appserver Essential: true - Image: mreferre/yelb-appserver:0.4 + Image: mreferre/yelb-appserver:0.5 Environment: - Name: SEARCH_DOMAIN Value: !Ref 'Domain' @@ -201,7 +201,7 @@ Resources: ContainerDefinitions: - Name: yelb-ui Essential: true - Image: mreferre/yelb-ui:0.4 + Image: mreferre/yelb-ui:0.5 Environment: - Name: SEARCH_DOMAIN Value: !Ref 'Domain' diff --git a/deployments/platformdeployment/Docker/docker-compose.yaml b/deployments/platformdeployment/Docker/docker-compose.yaml index 16b1f7a..e45ea8f 100644 --- a/deployments/platformdeployment/Docker/docker-compose.yaml +++ b/deployments/platformdeployment/Docker/docker-compose.yaml @@ -2,7 +2,7 @@ version: "2.1" services: yelb-ui: - image: mreferre/yelb-ui:0.3 + image: mreferre/yelb-ui:0.5 depends_on: - yelb-appserver ports: @@ -11,7 +11,7 @@ services: - yelb-network yelb-appserver: - image: mreferre/yelb-appserver:0.3 + image: mreferre/yelb-appserver:0.5 depends_on: - redis-server - yelb-db @@ -27,7 +27,7 @@ services: # - redisdata:/data yelb-db: - image: mreferre/yelb-db:0.3 + image: mreferre/yelb-db:0.5 networks: - yelb-network # uncomment the following lines if you want to persist postgres data across deployments diff --git a/deployments/platformdeployment/Docker/stack-deploy.yaml b/deployments/platformdeployment/Docker/stack-deploy.yaml index ad3bbcb..a948910 100644 --- a/deployments/platformdeployment/Docker/stack-deploy.yaml +++ b/deployments/platformdeployment/Docker/stack-deploy.yaml @@ -2,7 +2,7 @@ version: "3" services: yelb-ui: - image: mreferre/yelb-ui:0.3 + image: mreferre/yelb-ui:0.5 depends_on: - yelb-appserver ports: @@ -15,7 +15,7 @@ services: condition: on-failure yelb-appserver: - image: mreferre/yelb-appserver:0.3 + image: mreferre/yelb-appserver:0.5 depends_on: - redis-server - yelb-db @@ -39,7 +39,7 @@ services: condition: on-failure yelb-db: - image: mreferre/yelb-db:0.3 + image: mreferre/yelb-db:0.5 networks: - yelb-network # uncomment the following lines if you want to persist postgres data across deployments diff --git a/deployments/platformdeployment/Kubernetes/chart/yelb/templates/deployment.yaml b/deployments/platformdeployment/Kubernetes/chart/yelb/templates/deployment.yaml index 89ab8b0..027db78 100644 --- a/deployments/platformdeployment/Kubernetes/chart/yelb/templates/deployment.yaml +++ b/deployments/platformdeployment/Kubernetes/chart/yelb/templates/deployment.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: yelb-ui - image: nomisbeme/yelb-ui:0.3 + image: nomisbeme/yelb-ui:0.5 ports: - containerPort: 80 env: @@ -57,7 +57,7 @@ spec: spec: containers: - name: {{ template "yelb.fullname" . }}-db - image: mreferre/yelb-db:0.3 + image: mreferre/yelb-db:0.5 ports: - containerPort: 5432 --- @@ -77,7 +77,7 @@ spec: spec: containers: - name: {{ template "yelb.fullname" . }}-appserver - image: mreferre/yelb-appserver:0.3 + image: mreferre/yelb-appserver:0.5 ports: - containerPort: 4567 env: diff --git a/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-ingress-alb.yaml b/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-ingress-alb.yaml index 40e1718..20bc911 100644 --- a/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-ingress-alb.yaml +++ b/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-ingress-alb.yaml @@ -91,7 +91,7 @@ spec: spec: containers: - name: yelb-ui - image: mreferre/yelb-ui:0.3 + image: mreferre/yelb-ui:0.5 ports: - containerPort: 80 --- @@ -127,7 +127,7 @@ spec: spec: containers: - name: yelb-db - image: mreferre/yelb-db:0.3 + image: mreferre/yelb-db:0.5 ports: - containerPort: 5432 --- @@ -145,7 +145,7 @@ spec: spec: containers: - name: yelb-appserver - image: mreferre/yelb-appserver:0.3 + image: mreferre/yelb-appserver:0.5 ports: - containerPort: 4567 diff --git a/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-loadbalancer.yaml b/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-loadbalancer.yaml index 5378c46..009cdc1 100644 --- a/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-loadbalancer.yaml +++ b/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-loadbalancer.yaml @@ -75,7 +75,7 @@ spec: spec: containers: - name: yelb-ui - image: mreferre/yelb-ui:0.3 + image: mreferre/yelb-ui:0.5 ports: - containerPort: 80 --- @@ -111,7 +111,7 @@ spec: spec: containers: - name: yelb-db - image: mreferre/yelb-db:0.3 + image: mreferre/yelb-db:0.5 ports: - containerPort: 5432 --- @@ -129,7 +129,7 @@ spec: spec: containers: - name: yelb-appserver - image: mreferre/yelb-appserver:0.3 + image: mreferre/yelb-appserver:0.5 ports: - containerPort: 4567 diff --git a/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-minikube-hostport.yaml b/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-minikube-hostport.yaml index 812e3e4..b0d43bd 100644 --- a/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-minikube-hostport.yaml +++ b/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-minikube-hostport.yaml @@ -61,7 +61,7 @@ spec: spec: containers: - name: yelb-ui - image: mreferre/yelb-ui:0.3 + image: mreferre/yelb-ui:0.5 ports: - containerPort: 80 hostPort: 32777 # depending on the minikube driver you use you may be able to even use 80. But something above 32000 seems safer @@ -98,7 +98,7 @@ spec: spec: containers: - name: yelb-db - image: mreferre/yelb-db:0.3 + image: mreferre/yelb-db:0.5 ports: - containerPort: 5432 --- @@ -116,7 +116,7 @@ spec: spec: containers: - name: yelb-appserver - image: mreferre/yelb-appserver:0.3 + image: mreferre/yelb-appserver:0.5 ports: - containerPort: 4567 diff --git a/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-minikube-ingress.yaml b/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-minikube-ingress.yaml index 8b68c05..75e7ae3 100644 --- a/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-minikube-ingress.yaml +++ b/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-minikube-ingress.yaml @@ -87,7 +87,7 @@ spec: spec: containers: - name: yelb-ui - image: mreferre/yelb-ui:0.3 + image: mreferre/yelb-ui:0.5 ports: - containerPort: 80 --- @@ -123,7 +123,7 @@ spec: spec: containers: - name: yelb-db - image: mreferre/yelb-db:0.3 + image: mreferre/yelb-db:0.5 ports: - containerPort: 5432 --- @@ -141,7 +141,7 @@ spec: spec: containers: - name: yelb-appserver - image: mreferre/yelb-appserver:0.3 + image: mreferre/yelb-appserver:0.5 ports: - containerPort: 4567 diff --git a/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-minikube-nodeport.yaml b/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-minikube-nodeport.yaml index b2f8d7d..587d92a 100644 --- a/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-minikube-nodeport.yaml +++ b/deployments/platformdeployment/Kubernetes/yaml/cnawebapp-minikube-nodeport.yaml @@ -76,7 +76,7 @@ spec: spec: containers: - name: yelb-ui - image: mreferre/yelb-ui:0.3 + image: mreferre/yelb-ui:0.5 ports: - containerPort: 80 --- @@ -112,7 +112,7 @@ spec: spec: containers: - name: yelb-db - image: mreferre/yelb-db:0.3 + image: mreferre/yelb-db:0.5 ports: - containerPort: 5432 --- @@ -130,7 +130,7 @@ spec: spec: containers: - name: yelb-appserver - image: mreferre/yelb-appserver:0.3 + image: mreferre/yelb-appserver:0.5 ports: - containerPort: 4567