Skip to content

Commit

Permalink
Bumped all deployment files to use docker images (yelb-ui, yelb-appse…
Browse files Browse the repository at this point in the history
…rver and yelb-db) with tag 0.5
  • Loading branch information
mreferre committed Jun 5, 2019
1 parent 0fe100f commit 9cba442
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion deployments/localdevelopment/setupdevenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions deployments/localtest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions deployments/localtest/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -26,6 +26,6 @@ services:
- 6379:6379

yelb-db:
image: mreferre/yelb-db:0.3
image: mreferre/yelb-db:0.5
ports:
- 5432:5432
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions deployments/platformdeployment/Docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions deployments/platformdeployment/Docker/stack-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
---
Expand All @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
Expand Down Expand Up @@ -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
---
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
Expand Down Expand Up @@ -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
---
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
---
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
Expand Down Expand Up @@ -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
---
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
Expand Down Expand Up @@ -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
---
Expand All @@ -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

Expand Down

0 comments on commit 9cba442

Please sign in to comment.