global bugfix with zpm and clean up

Author: evshvarov

.github/workflows/objectscript-quality.yml

@@ -0,0 +1,12 @@
+name: objectscriptquality
+on: push
+
+jobs:
+  linux:
+    name: Linux build
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Execute ObjectScript Quality Analysis
+      run: wget https://raw.githubusercontent.com/litesolutions/objectscriptquality-jenkins-integration/master/iris-community-hook.sh && sh ./iris-community-hook.sh
+

.vscode/settings.json

@@ -2,11 +2,32 @@
     "files.associations": {
 
         "Dockerfile*": "dockerfile",
+        "iris.script": "objectscript"
       },
-    "objectscript.conn.active": true,
-    "objectscript.conn.version": 3,
-    "objectscript.conn.ns": "IRISAPP",
-    "objectscript.conn.port": 52775 , 
-    "objectscript.export.addCategory": true
+    "objectscript.conn" :{
+      "ns": "IRISAPP",
+      "username": "_SYSTEM",
+      "password": "SYS",
+      "docker-compose": {
+        "service": "iris",
+        "internalPort": 52773
+      },
+      "active": true
+    },
+    "sqltools.connections": [
+      {
+        "namespace": "IRISAPP",
+        "connectionMethod": "Server and Port",
+        "showSystem": false,
+        "previewLimit": 50,
+        "server": "localhost",
+        "port": 32770,
+        "askForPassword": false,
+        "driver": "InterSystems IRIS",
+        "name": "objectscript-docker",
+        "username": "_SYSTEM",
+        "password": "SYS"
+      }
+    ]
 
 }

Dockerfile

@@ -1,39 +1,23 @@
 ARG IMAGE=intersystems/iris:2019.1.0S.111.0
 ARG IMAGE=store/intersystems/iris-community:2019.3.0.309.0
 ARG IMAGE=store/intersystems/iris-community:2019.4.0.379.0
+ARG IMAGE=intersystemsdc/iris-community
 FROM $IMAGE
 
-USER root
+USER root   
+## add git
+RUN apt update && apt-get -y install git
+        
+WORKDIR /opt/irisbuild
+RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /opt/irisbuild
+USER ${ISC_PACKAGE_MGRUSER}
 
-WORKDIR /opt/irisapp
-RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /opt/irisapp
-
-
-USER irisowner
-
-RUN mkdir -p /tmp/deps \
-
- && cd /tmp/deps \
-
- && wget -q https://pm.community.intersystems.com/packages/zpm/latest/installer -O zpm.xml
-
-
-COPY  Installer.cls .
+#COPY  Installer.cls .
 COPY  src src
-COPY irissession.sh /
-
-# running IRIS and open IRIS termninal in USER namespace
-SHELL ["/irissession.sh"]
-# below is objectscript executed in terminal
-# each row is what you type in terminal and Enter
-# zpm "install webterminal" 
-RUN \
-  do $SYSTEM.OBJ.Load("Installer.cls", "ck") \
-  set sc = ##class(App.Installer).setup() \
-  Do $system.OBJ.Load("/tmp/deps/zpm.xml", "ck") \
-  zn "IRISAPP" 
-  
+COPY Installer.cls Installer.cls
+COPY module.xml module.xml
+COPY iris.script iris.script
 
-# bringing the standard shell back
-SHELL ["/bin/bash", "-c"]
-CMD [ "-l", "/usr/irissys/mgr/messages.log" ]
+RUN iris start IRIS \
+	&& iris session IRIS < iris.script \
+    && iris stop IRIS quietly

Installer.cls

@@ -4,40 +4,15 @@ Class App.Installer
 XData setup
 {
 <Manifest>
-  <Default Name="SourceDir" Value="#{$system.Process.CurrentDirectory()}src"/>
   <Default Name="Namespace" Value="IRISAPP"/>
-  <Default Name="app" Value="irisapp" />
-  <Default Name="restapp" Value="/rest-test" />
-
+  <Default Name="database" Value="irisapp"/>
+  
   <Namespace Name="${Namespace}" Code="${Namespace}" Data="${Namespace}" Create="yes" Ensemble="no">
 
     <Configuration>
-      <Database Name="${Namespace}" Dir="/opt/${app}/data" Create="yes" Resource="%DB_${Namespace}"/>
-
-      <Import File="${SourceDir}" Flags="ck" Recurse="1"/>
+      <Database Name="${Namespace}" Dir="${mgrdir}${database}/data" Create="yes" Resource="%DB_${Namespace}"/>
     </Configuration>
-    <CSPApplication Url="/csp/${app}" 
-      Directory="${cspdir}${app}" 
-      ServeFiles="1"
-      Recurse="1" 
-      Grant="%DB_${Namespace},%SQL"
-      AuthenticationMethods="32"
-       
-    />
-    <CSPApplication Url="${restapp}"
-      Recurse="1"
-      Directory="${cspdir}${restapp}" 
-      Grant="%DB_${Namespace},%SQL"
-      AuthenticationMethods="96"
-      />
-
   </Namespace>
-    <Invoke Class="App.Installer" Method="SetDispatchClass">
-    <Arg Value="${restapp}"/>
-    <Arg Value="community.objectscript.RESTExample"/>
-  </Invoke>
-
-
 </Manifest>
 }
 
@@ -47,18 +22,4 @@ ClassMethod setup(ByRef pVars, pLogLevel As %Integer = 3, pInstaller As %Install
   Quit ##class(%Installer.Manifest).%Generate(%compiledclass, %code, "setup")
 }
 
-ClassMethod SetDispatchClass(pApp As %String, pClass As %String) As %Status
-{
-  New $Namespace
-  Set $Namespace = "%SYS"
-  Set tSC = ##class(Security.Applications).Get(pApp, .webProperties)
-  If $$$ISERR(tSC) {
-    Quit tSC
-  }
-  
-  Set webProperties("DispatchClass") = pClass
-  Set tSC = ##class(Security.Applications).Modify(pApp, .webProperties)
-  Quit tSC
-}
-
 }

docker-compose.yml

@@ -3,13 +3,11 @@ services:
   iris:
     build: 
       context: .
-      dockerfile: ${DOCKERFILE:-Dockerfile}
+      dockerfile: Dockerfile
     restart: always
     ports: 
-      - 51773
-      - ${IRIS_PORT}:52773
+      - 1972
+      - 52773
       - 53773
     volumes:
-      - ~/iris.key:/usr/irissys/mgr/iris.key
-      - ./:/irisdev/app
-      - ./src/csp:/usr/irissys/mgr/csp/irisapp
+      - ./:/irisrun/repo

iris.script

@@ -0,0 +1,12 @@
+// Unexpire passwords for dev mode
+zn "%SYS"
+Do ##class(Security.Users).UnExpireUserPasswords("*")
+
+// create IRISAPP namespace
+do $SYSTEM.OBJ.Load("/opt/irisbuild/Installer.cls", "ck") 
+set sc = ##class(App.Installer).setup() 
+
+
+zn "IRISAPP"
+zpm "load /opt/irisbuild/ -v":1:1
+halt

irissession.sh

@@ -3,7 +3,7 @@
   <Document name="objectscript-package-template.ZPM">
     <Module>
       <Name>objectscript-package-template</Name>
-      <Version>1.0.3</Version>
+      <Version>1.0.4</Version>
       <Packaging>module</Packaging>
       <SourcesRoot>src</SourcesRoot>
       <Resource Name="community.objectscript.PKG"/>