Updating App Cloud Paks

Signed-off-by: Arthur De Magalhaes <[email protected]>

Author: arthurdm

.gitignore

@@ -1 +1,2 @@
-.DS_STORE
+.DS_STORE
+lab-artifacts/application/target

lab-artifacts/ApplicationDockerfile

@@ -0,0 +1,6 @@
+FROM microservice-enterprise-web:1.0.0
+
+COPY --chown=1001:0 server.xml /config/server.xml
+COPY --chown=1001:0 application/target/microservice-vote-1.0.0-SNAPSHOT.war /config/apps/vote.war
+
+RUN configure.sh

lab-artifacts/docker/EnterpriseDockerfile lab-artifacts/EnterpriseDockerfile

@@ -1,13 +1,12 @@
 ## Login to ICP registry
 docker login greyjoy.icp:8500
 
-## Build and push Enterprise Image
-docker build -t greyjoy.icp:8500/arthurdm/acmeair:enterpriseWeb -f EnterpriseDockerfile  .
-docker push greyjoy.icp:8500/arthurdm/acmeair:enterpriseWeb 
+## Build the Enterprise Image
+docker build -t microservice-enterprise-web:1.0.0  -f EnterpriseDockerfile .
 
 ## Build and push Application Image
-docker build -t greyjoy.icp:8500/arthurdm/microservice-vote:latest -f ApplicationDockerfile .
-docker push greyjoy.icp:8500/arthurdm/microservice-vote:latest
+docker build -t greyjoy.icp:8500/arthurdm/microservice-vote:1.0.0 -f ApplicationDockerfile .
+docker push greyjoy.icp:8500/arthurdm/microservice-vote:1.0.0
 
 # Login to ICP
 cloudctl login -a https://9.42.98.67:8443 --skip-ssl-validation
@@ -18,4 +17,4 @@ helm install incubator/couchdb -f db_values.yaml --tls
 
 ## Deploy Liberty
 helm repo add ibm-charts https://raw.githubusercontent.com/IBM/charts/master/repo/stable/
-helm install ibm-charts/ibm-websphere-liberty -f app_values.yaml -f enterprise_values.yaml  --tls
+helm install ibm-charts/ibm-websphere-liberty -f app_overrides.yaml -f enterprise_overrides.yaml  --tls

lab-artifacts/commands.txt

@@ -1,6 +1,6 @@
 image:
-  repository: greyjoy.icp:8500/arthurdm/microservice-vote
-  tag: latest
+  repository: greyjoy.icp:8500/ademagalhaes/microservice-vote
+  tag: 1.0.0
   pullPolicy: Always
   license: ""