Springboot code (#162)

* Springboot code

* Review changes

* add springboot in Lab configurations

* dockerfile changes

* docker build added

Author: matayal

grabdish/deploy.sh

@@ -2,7 +2,7 @@
 # Copyright (c) 2021 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-MS="frontend-helidon order-helidon supplier-helidon-se inventory-helidon"
+MS="frontend-helidon order-helidon supplier-helidon-se inventory-helidon inventory-springboot"
 for s in $MS; do 
     echo ________________________________________
     echo "Deploying $s..."

grabdish/inventory-springboot/Dockerfile

@@ -2,8 +2,8 @@ FROM maven:3.6.3-openjdk-11 AS maven_build
 COPY pom.xml /tmp/
 COPY src /tmp/src/
 WORKDIR /tmp/
-RUN mvn package
 FROM openjdk
 EXPOSE 8080
-CMD java -jar /data/inventory-springboot-0.1.0.jar
-COPY --from=maven_build /tmp/target/inventory-springboot-0.1.0.jar /data/inventory-springboot-0.1.0.jar
+ARG JAR_FILE=target/*.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT ["java","-jar","/app.jar"]

grabdish/inventory-springboot/build.sh

@@ -15,10 +15,10 @@ fi
 
 export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
 
-#mvn package
+mvn clean package spring-boot:repackage
 docker build -t=$IMAGE .
 
 docker push "$IMAGE"
 if [  $? -eq 0 ]; then
     docker rmi "$IMAGE"
-fi
+fi

grabdish/inventory-springboot/inventory-springboot-deployment.yaml

@@ -1,13 +1,7 @@
-
-##
-## Copyright (c) 2021 Oracle and/or its affiliates.
-## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: inventory-springboot
-  labels:
-    app: inventory
 spec:
   replicas: 1
   selector:
@@ -20,57 +14,42 @@ spec:
         version: springboot
     spec:
       containers:
-        - name: inventory
-          imagePullPolicy: Always
-          image: %DOCKER_REGISTRY%/%IMAGE_NAME%:%IMAGE_VERSION%
-          volumeMounts:
-            - name: creds
-              mountPath: /msdataworkshop/creds
-          ports:
-            - containerPort: 8080
-          livenessProbe:
-            httpGet:
-              path: /health/live
-              port: 8080
-            initialDelaySeconds: 20
-            periodSeconds: 20
-            timeoutSeconds: 5
-            failureThreshold: 3
-          readinessProbe:
-            httpGet:
-              path: /health/ready
-              port: 8080
-            initialDelaySeconds: 3
-            periodSeconds: 3
-            timeoutSeconds: 5
-            failureThreshold: 20
-          env:
-            - name: LOG_LEVEL
-              value: "DEBUG"
-            - name: server_port
-              value: "8080"
-            - name: db_user
-              value: "inventoryuser"
-            - name: db_url
-              value: "jdbc:oracle:thin:@%INVENTORY_PDB_NAME%_tp?TNS_ADMIN=/msdataworkshop/creds"
-            - name: db_queueOwner
-              value: "inventoryuser"
-            - name: db_orderQueueName
-              value: "orderqueue"
-            - name: db_inventoryQueueName
-              value: "inventoryqueue"
-            - name: OCI_REGION
-              value: "%OCI_REGION%"
-            - name: VAULT_SECRET_OCID
-              value: "%VAULT_SECRET_OCID%"
-            - name: db_password
-              valueFrom:
-                secretKeyRef:
-                  name: dbuser
-                  key: dbpassword
-                  optional: true #not needed/used if using VAULT_SECRET_OCID exists
+      - name: inventory
+        image: %DOCKER_REGISTRY%/%IMAGE_NAME%:%IMAGE_VERSION%
+        imagePullPolicy: Always
+        env:
+        - name: LOG_LEVEL
+          value: "DEBUG"
+        - name: server_port
+          value: "8080"
+        - name: db_user
+          value: "inventoryuser"
+        - name: db_url
+          value: "jdbc:oracle:thin:@%INVENTORY_PDB_NAME%_tp?TNS_ADMIN=/msdataworkshop/creds"
+        - name: db_queueOwner
+          value: "inventoryuser"
+        - name: db_orderQueueName
+          value: "orderqueue"
+        - name: db_inventoryQueueName
+          value: "inventoryqueue"
+        - name: OCI_REGION
+          value: "%OCI_REGION%"
+        - name: VAULT_SECRET_OCID
+          value: "%VAULT_SECRET_OCID%"
+        - name: db_password
+          valueFrom:
+            secretKeyRef:
+              name: dbuser
+              key: dbpassword
+              optional: true #not needed/used if using VAULT_SECRET_OCID exists
+        volumeMounts:
+        - name: creds
+          mountPath: /msdataworkshop/creds
+        ports:
+        - containerPort: 8080
       restartPolicy: Always
       volumes:
       - name: creds
         secret:
-          secretName: db-wallet-secret
+          secretName: db-wallet-secret
+