Merge pull request #819 from cambridge-cares/1579-dev-stackerise-cea-agent

1579 dev stackerise cea agent

Author: YiKaiTsai

Agents/CEAAgent/.vscode/launch.json

@@ -0,0 +1,57 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "type": "java",
+            "name": "Debug",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": "5005",
+            "preLaunchTask": "compose-deploy",
+            "projectName": "${workspaceFolderBasename}"
+        },
+        {
+            "type": "java",
+            "name": "Build and Debug",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": "5005",
+            "preLaunchTask": "compose-build-deploy",
+            "projectName": "${workspaceFolderBasename}"
+        },
+        {
+            "type": "java",
+            "name": "Reattach and Debug",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": "5005",
+            "projectName": "${workspaceFolderBasename}"
+        }
+    ],
+    "inputs": [
+        {
+            "id": "debug.port",
+            "type": "command",
+            // Get the next avaliable debug port and write it to the cache file
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "bash ./stack.sh ports write",
+                "useFirstResult": true
+            }
+        },
+        {
+            "id": "debug.port.read",
+            "type": "command",
+            // Get the last debug port from the cache file
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "bash ./stack.sh ports read",
+                "useFirstResult": true
+            }
+        }
+    ]
+}

Agents/CEAAgent/.vscode/tasks.json

@@ -0,0 +1,78 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "type": "shell",
+            "label": "compose-build",
+            "command": "bash",
+            "args": [
+                "-c",
+                "./stack.sh build"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "type": "shell",
+            "label": "compose-deploy-internal",
+            "command": "./stack.sh",
+            "args": [
+                "start",
+                "${input:stackName}",
+                "--debug-port",
+                "${input:debug.port}"
+            ],
+            "options": {
+                "shell": {
+                    "executable": "bash"
+                }
+            }
+        },
+        {
+            "type": "shell",
+            "label": "compose-deploy",
+            "command": "sleep 1",
+            "dependsOn": [
+                "compose-deploy-internal"
+            ],
+            "windows": {
+                "options": {
+                    "shell": {
+                        "executable": "powershell"
+                    }
+                }
+            }
+        },
+        {
+            "type": "shell",
+            "label": "compose-build-deploy",
+            "dependsOn": [
+                "compose-build",
+                "compose-deploy"
+            ],
+            "dependsOrder": "sequence"
+        }
+    ],
+    "inputs": [
+        {
+            "id": "stackName",
+            "type": "promptString",
+            "description": "Name your stack.",
+            "default": "TEST-STACK"
+        },
+        {
+            "id": "debug.port",
+            "type": "command",
+            // Get the last debug port from the cache file
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "bash ./stack.sh ports read",
+                "useFirstResult": true
+            }
+        }
+    ]
+}

Agents/CEAAgent/Dockerfile

@@ -17,11 +17,6 @@ WORKDIR /root/.m2
 RUN sed -i "s|MASTER_PASSWORD|$(mvn --encrypt-master-password master_password)|" settings-security.xml
 RUN sed -i "s|REPO_USERNAME|$(cat ../credentials/repo_username.txt)|;s|REPO_PASSWORD|$(cat ../credentials/repo_password.txt|xargs mvn --encrypt-password)|" settings.xml
 
-# Set username and password from credentials
-WORKDIR /root/cea-agent/src/main/resources
-RUN sed -i "s|USERNAME|$(cat ../../../../credentials/postgres_username.txt)|;s|PASSWORD|$(cat ../../../../credentials/postgres_password.txt)|" timeseriesclient.properties
-RUN sed -i "s|USERNAME|$(cat ../../../../credentials/postgis_username.txt)|;s|PASSWORD|$(cat ../../../../credentials/postgis_password.txt)|" postgis.properties
-
 # Build
 WORKDIR /root/cea-agent
 RUN mvn package
@@ -53,5 +48,5 @@ ENV PATH "/venv/bin:/venv/cea/bin:/venv/Daysim:$PATH"
 SHELL ["/bin/bash", "-c"]
 
 # Start the Tomcat server
-ENTRYPOINT ["java", "-cp", "target/cea-agent-0.3.1-jar-with-dependencies.jar" , "uk.ac.cam.cares.jps.agent.cea.Main"]
+ENTRYPOINT ["java", "-cp", "target/cea-agent-1.0.0-jar-with-dependencies.jar" , "uk.ac.cam.cares.jps.agent.cea.Main"]
 #==================================================================================================