Merge pull request #71 from intersystems-community/publish_date

Publish date added

Author: nsolov

.dockerignore

@@ -1 +1,2 @@
-**/.DS_Store
+**/.DS_Store
+.*

.vscode/settings.json

@@ -7,11 +7,15 @@
     "username": "_SYSTEM",
     "password": "SYS",
     "ns": "REGISTRY",
-    "port": 52773,
-    "addCategory": true,
+    "host": "localhost",
+    "port": 52774,
     "links": {
       "Swagger spec": "http://${host}:${port}/registry/_spec",
       "All Packages": "http://${host}:${port}/registry/packages/-/all"
     }
+  },
+  "objectscript.export": {
+    "folder": "src",
+    "addCategory": true
   }
 }

Dockerfile

@@ -1,28 +1,29 @@
-#FROM store/intersystems/iris-community:2020.1.0.215.0
-FROM intersystemsdc/iris-community:2020.4.0.524.0-zpm
+FROM containers.intersystems.com/intersystems/iris-community:2022.2.0.270.0
 
-USER root
+WORKDIR /opt/registry
 
-COPY zpm-registry.yaml /usr/irissys/
+USER root
 
-WORKDIR /opt/zpm
-RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} .
+RUN chown irisowner:irisowner .
 
 USER irisowner
 
-COPY  Installer.cls .
-COPY  SQLPriv.xml .
-COPY  src src
-COPY irissession.sh /
-SHELL ["/irissession.sh"]
-
-RUN \
-  do $SYSTEM.OBJ.Load("Installer.cls", "ck") \
-  set sc = ##class(ZPM.Installer).setup()    \
-  zn "registry"                              \
-  zpm "install yaml-utils"
-
-# bringing the standard shell back
-SHELL ["/bin/bash", "-c"]
-
-
+COPY --chown=irisowner:irisowner . .
+
+RUN  \
+  VERSION=$(sed -n 's|.*<Version>\(.*\)</Version>.*|\1|p' module.xml | head -1) && \
+  sed -i 's|^Parameter VERSION .*$|Parameter VERSION = "'"$VERSION"'";|g' \
+    ./src/cls/ZPM/Registry.cls                                   && \
+  iris start ${ISC_PACKAGE_INSTANCENAME}                         && \
+  /bin/echo -e ""                                                   \
+    " zn \"%SYS\""                                                  \
+    " do ##class(%SYSTEM.Process).CurrentDirectory(\"$PWD\")"       \
+    " do ##class(%SYSTEM.OBJ).Load(\"Installer.cls\", \"ck\")"      \
+    " set sc = ##class(ZPM.Installer).setup() "                     \
+    " if '\$Get(sc) { do ##class(%SYSTEM.Process).Terminate(, 1) }" \
+    " halt"                                                         \
+  | iris session ${ISC_PACKAGE_INSTANCENAME} -U %SYS             && \
+  tail /usr/irissys/mgr/messages.log && \
+  iris stop ${ISC_PACKAGE_INSTANCENAME} quietly                  && \
+  rm -rf /usr/irissys/mgr/IRIS.WIJ                               && \
+  rm -rf /usr/irissys/mgr/journal/*

module.xml

@@ -4,7 +4,7 @@
     <Module>
       <Name>zpm-registry</Name>
       <Description>Registry server for ZPM</Description>
-      <Version>1.1.4</Version>
+      <Version>1.1.5</Version>
       <Packaging>module</Packaging>
       <Dependencies>
         <ModuleReference>

src/cls/ZPM/Package.cls

@@ -55,6 +55,8 @@ Property versionPrerelease As %String [ SqlComputeCode = {Set {*} = $Piece($Piec
 
 Property versionBuildmetadata As %String [ SqlComputeCode = {Set {*} = $Piece({version},"+",2)}, SqlComputed, SqlComputeOnChange = %%INSERT ];
 
+Property publishTS As %PosixTime [ SqlComputeCode = {Set {*} = ##class(%Library.PosixTime).CurrentUTCTimeStamp()}, SqlComputed, SqlComputeOnChange = %%INSERT ];
+
 Property UpLink As ZPM.UpLink(%JSONINCLUDE = "NONE");
 
 ForeignKey UpLinkFK(UpLink) References ZPM.UpLink() [ OnDelete = cascade ];
@@ -97,7 +99,10 @@ ClassMethod ServerURL() As %String
       Set host = host_":"_port
     }    
   }
-  //Set host = host_$p(%request.Application,"/",1,*-1)
+  #; If not behind the proxy where it have to be hidden redirect from / to /registry
+  if %request.GetCgiEnv("HTTP_X_FORWARDED_HOST")="" {
+    Set host = host _ $p(%request.Application, "/" ,1,*-1)
+  }
   Return host
 }
 
@@ -618,6 +623,9 @@ Storage Default
 <Value name="19">
 <Value>UpLink</Value>
 </Value>
+<Value name="20">
+<Value>publishTS</Value>
+</Value>
 </Data>
 <Data name="dependencies">
 <Attribute>dependencies</Attribute>

src/cls/ZPM/Registry.cls

@@ -2,6 +2,8 @@
 Class ZPM.Registry Extends ZPM.REST.Base
 {
 
+Parameter VERSION = "1.0.0";
+
 XData UrlMap [ XMLNamespace = "http://www.intersystems.com/urlmap" ]
 {
 <Routes>
@@ -50,7 +52,13 @@ XData UrlMap [ XMLNamespace = "http://www.intersystems.com/urlmap" ]
 /// Package Manager general information
 ClassMethod GetInfo() As %Status
 {
-  SET version = $get(^RegistryVersion, "0.0.2")
+  SET version = ..#VERSION
+  If $System.CLS.IsMthd("%ZPM.PackageManager.Developer.Module", "NameOpen") {
+    Set zpmModule = ##class(%ZPM.PackageManager.Developer.Module).NameOpen("zpm-registry")
+    If $IsObject(zpmModule) {
+      Set version = zpmModule.VersionString
+    }
+  }
   SET info = {
     "version": (version)
   }