Skip to content

Commit ef2e41d

Browse files
committed
update to a newest version of iris
1 parent 4b014dd commit ef2e41d

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.vscode/settings.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
},
77
"objectscript.conn" :{
88
"ns": "IRISAPP",
9-
"username":"_SYSTEM",
9+
"username": "_SYSTEM",
1010
"password": "SYS",
1111
"docker-compose": {
1212
"service": "iris",
1313
"internalPort": 52773
14-
}
14+
},
15+
"active": false
1516
},
1617
"sqltools.connections": [
1718
{

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ ARG IMAGE=intersystemsdc/iris-community:2020.1.0.209.0-zpm
33
ARG IMAGE=intersystemsdc/iris-community:2020.2.0.204.0-zpm
44
ARG IMAGE=intersystemsdc/irishealth-community:2020.3.0.200.0-zpm
55
ARG IMAGE=intersystemsdc/iris-community:2020.3.0.200.0-zpm
6+
ARG IMAGE=intersystemsdc/iris-community:2020.3.0.221.0-zpm
67
FROM $IMAGE
78

8-
USER root
9-
9+
USER root
10+
1011
WORKDIR /opt/irisapp
1112
RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /opt/irisapp
1213
USER ${ISC_PACKAGE_MGRUSER}
@@ -15,7 +16,6 @@ COPY Installer.cls .
1516
COPY src src
1617
COPY iris.script /tmp/iris.script
1718

18-
# run iris and initial
1919
RUN iris start IRIS \
20-
&& iris session IRIS < /tmp/iris.script \
20+
&& iris session IRIS < /tmp/iris.script \
2121
&& iris stop IRIS quietly

Installer.cls

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ Class App.Installer
44
XData setup
55
{
66
<Manifest>
7-
<Default Name="SourceDir" Value="#{$system.Process.CurrentDirectory()}src"/>
87
<Default Name="Namespace" Value="IRISAPP"/>
98
<Default Name="app" Value="irisapp" />
109

@@ -13,7 +12,6 @@ XData setup
1312
<Configuration>
1413
<Database Name="${Namespace}" Dir="/opt/${app}/data" Create="yes" Resource="%DB_${Namespace}"/>
1514
</Configuration>
16-
<Import File="${SourceDir}" Flags="ck" Recurse="1"/>
1715
<CSPApplication Url="/csp/${app}" Directory="${cspdir}${app}" ServeFiles="1" Recurse="1" MatchRoles=":%DB_${Namespace}" AuthenticationMethods="32"
1816

1917
/>

iris.script

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
do $SYSTEM.OBJ.Load("/opt/irisapp/Installer.cls", "ck")
33
set sc = ##class(App.Installer).setup()
44

5+
zn "IRISAPP"
6+
do $System.OBJ.LoadDir("/opt/irisapp/src","ck",,1)
7+
58
zn "%SYS"
69
Do ##class(Security.Users).UnExpireUserPasswords("*")
710

0 commit comments

Comments
 (0)