Skip to content

Commit fa69aad

Browse files
Evgeny ShvarovEvgeny Shvarov
authored andcommitted
2019.4 update and better installer
1 parent a7f739c commit fa69aad

4 files changed

Lines changed: 11 additions & 3 deletions

File tree

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG IMAGE=intersystems/iris:2019.1.0S.111.0
22
ARG IMAGE=store/intersystems/irishealth:2019.3.0.308.0-community
33
ARG IMAGE=store/intersystems/iris-community:2019.3.0.309.0
4+
ARG IMAGE=store/intersystems/iris-community:2019.4.0.379.0
45
FROM $IMAGE
56

67
USER root

Dockerfile-web

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG IMAGE=intersystems/iris:2019.1.0S.111.0
22
ARG IMAGE=store/intersystems/irishealth:2019.3.0.308.0-community
33
ARG IMAGE=store/intersystems/iris-community:2019.3.0.309.0
4+
ARG IMAGE=store/intersystems/iris-community:2019.4.0.379.0
45
FROM $IMAGE
56

67
USER root

Dockerfile-zpm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ARG IMAGE=intersystems/iris:2019.1.0S.111.0
22
ARG IMAGE=store/intersystems/iris-community:2019.3.0.309.0
3+
ARG IMAGE=store/intersystems/iris-community:2019.4.0.379.0
34
FROM $IMAGE
45

56
USER root

Installer.cls

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,19 @@ XData setup
55
{
66
<Manifest>
77
<Default Name="SourceDir" Value="#{$system.Process.CurrentDirectory()}src"/>
8+
<Default Name="Namespace" Value="IRISAPP"/>
9+
<Default Name="app" Value="irisapp" />
810

9-
<Namespace Name="IRISAPP" Code="IRISAPP" Data="IRISAPP" Create="yes" Ensemble="no">
11+
<Namespace Name="${Namespace}" Code="${Namespace}" Data="${Namespace}" Create="yes" Ensemble="no">
1012

1113
<Configuration>
12-
<Database Name="IRISAPP" Dir="/opt/irisapp/data" Create="yes"/>
14+
<Database Name="${Namespace}" Dir="/opt/${app}/data" Create="yes" Resource="%DB_${Namespace}"/>
1315

1416
<Import File="${SourceDir}" Flags="ck" Recurse="1"/>
1517
</Configuration>
18+
<CSPApplication Url="/csp/${app}" Directory="${cspdir}${app}" ServeFiles="1" Recurse="1" MatchRoles=":%DB_${Namespace}" AuthenticationMethods="32"
19+
20+
/>
1621
</Namespace>
1722

1823
</Manifest>
@@ -24,4 +29,4 @@ ClassMethod setup(ByRef pVars, pLogLevel As %Integer = 3, pInstaller As %Install
2429
Quit ##class(%Installer.Manifest).%Generate(%compiledclass, %code, "setup")
2530
}
2631

27-
}
32+
}

0 commit comments

Comments
 (0)