Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small changes #16

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.idea/
**/target/
*.zip
inspect.json
5 changes: 4 additions & 1 deletion tools/demo-scripts/local-demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,7 @@ pe

pe "skupper expose deployment backend --port 8080"

pe "skupper network status"
pe "skupper network status"

pe "podman delete backend"
pe
2 changes: 1 addition & 1 deletion tools/setup-sydney-k8s-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ YELLOW='\033[1;33m'
NC='\033[0m' # No Color

#m Edit these two environment variables as you create more environment setup scripts.
export ENVIRONMENT_PROMPT="SYDNEY"
export ENVIRONMENT_PROMPT="PUBLIC CLOUD"
export KUBECONFIG=$HOME/.kube/app-modernisation-sydney

printf "Setting up isolated Kubernetes environment in: ${YELLOW}$KUBECONFIG${NC}\n"
Expand Down
13 changes: 10 additions & 3 deletions tools/start-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,19 @@ PGSQL_DB=demo-db
POSTRES_IMAGE=registry.redhat.io/rhel8/postgresql-13:1-56.1654147925
BACKEND_IMAGE=quay.io/bfarr/jboss-demo-backend
FRONTEND_IMAGE=quay.io/bfarr/jboss-demo-frontend
HOST=host.containers.internal
echo $HOST

podman network create banking-app

# If you want the data to persist across sessions use this option:
# -v /host/db/path:/var/lib/pgsql/data
$CONTAINER_RUNTIME run --rm -d --name pgdb -e POSTGRESQL_USER=$PGSQL_USER -e POSTGRESQL_PASSWORD=$PGSQL_PASSWORD -e POSTGRESQL_DATABASE=$PGSQL_DB -p 5432:5432 $POSTRES_IMAGE
#$CONTAINER_RUNTIME run --rm -d --name pgdb -e POSTGRESQL_USER=$PGSQL_USER -e POSTGRESQL_PASSWORD=$PGSQL_PASSWORD -e POSTGRESQL_DATABASE=$PGSQL_DB -p 5432:5432 $POSTRES_IMAGE
$CONTAINER_RUNTIME run --rm -d --name pgdb --hostname pgdb --network banking-app -e POSTGRESQL_USER=$PGSQL_USER -e POSTGRESQL_PASSWORD=$PGSQL_PASSWORD -e POSTGRESQL_DATABASE=$PGSQL_DB -p 5432:5432 $POSTRES_IMAGE
sleep 5

$CONTAINER_RUNTIME run --rm -d -e POSTGRES_SERVICE_HOST=$(hostname) -e POSTGRES_DB=$PGSQL_DB -e POSTGRES_USER=$PGSQL_USER -e POSTGRES_PASSWORD=$PGSQL_PASSWORD -p 8080:8080 --name backend $BACKEND_IMAGE
#$CONTAINER_RUNTIME run --rm -d -e POSTGRES_SERVICE_HOST=$(hostname) -e POSTGRES_DB=$PGSQL_DB -e POSTGRES_USER=$PGSQL_USER -e POSTGRES_PASSWORD=$PGSQL_PASSWORD -p 8080:8080 --name backend $BACKEND_IMAGE
$CONTAINER_RUNTIME run --rm -d -e POSTGRES_SERVICE_HOST=pgdb -e POSTGRES_DB=$PGSQL_DB -e POSTGRES_USER=$PGSQL_USER -e POSTGRES_PASSWORD=$PGSQL_PASSWORD -p 8080:8080 --name backend --hostname backend --network banking-app $BACKEND_IMAGE

$CONTAINER_RUNTIME run --rm -d -e BACKEND_PROVIDER_URL=remote+http://$(hostname):8080 -p 8180:8080 --name frontend $FRONTEND_IMAGE
#$CONTAINER_RUNTIME run --rm -d -e BACKEND_PROVIDER_URL=remote+http://$(hostname):8080 -p 8180:8080 --name frontend $FRONTEND_IMAGE
$CONTAINER_RUNTIME run --rm -d -e BACKEND_PROVIDER_URL=remote+http://backend:8080 -p 8180:8080 --hostname frontend --name frontend --network banking-app $FRONTEND_IMAGE
2 changes: 2 additions & 0 deletions yaml/backend-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Deployment
metadata:
labels:
app: backend
application: backend-app
name: backend
spec:
replicas: 1
Expand All @@ -13,6 +14,7 @@ spec:
metadata:
labels:
app: backend
application: backend-app
spec:
containers:
- name: backend
Expand Down
2 changes: 2 additions & 0 deletions yaml/frontend-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
application: frontend-app
app: frontend
name: frontend
spec:
Expand All @@ -13,6 +14,7 @@ spec:
metadata:
labels:
app: frontend
application: frontend-app
spec:
containers:
- name: frontend
Expand Down