Skip to content

Commit 8087e92

Browse files
Evgeny ShvarovEvgeny Shvarov
authored andcommitted
docker simplified
1 parent b44a106 commit 8087e92

4 files changed

Lines changed: 39 additions & 16 deletions

File tree

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
IRIS_PORT=52773

Installer.cls

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
11
Class App.Installer
22
{
33

4-
XData MyInstall [ XMLNamespace = INSTALLER ]
4+
XData setup
55
{
66
<Manifest>
7-
<Default Name="NAMESPACE" Value="USER"/>
8-
<Default Name="DBNAME" Value="USER"/>
9-
<Default Name="APPPATH" Dir="/opt/app/" />
10-
<Default Name="SOURCESPATH" Dir="${APPPATH}src" />
11-
<Default Name="RESOURCE" Value="%DB_${DBNAME}" />
7+
<Default Name="SourceDir" Value="#{$system.Process.CurrentDirectory()}src"/>
8+
9+
<Namespace Name="MYAPP" Code="MYAPP" Data="MYAPP" Create="yes" Ensemble="no">
1210

13-
<Namespace Name="${NAMESPACE}" Code="${DBNAME}-CODE" Data="${DBNAME}-DATA" Create="yes" Ensemble="0">
1411
<Configuration>
15-
<Database Name="${DBNAME}-CODE" Dir="${APPPATH}${DBNAME}-CODE" Create="yes" Resource="${RESOURCE}"/>
16-
<Database Name="${DBNAME}-DATA" Dir="${APPPATH}${DBNAME}-DATA" Create="yes" Resource="${RESOURCE}"/>
17-
</Configuration>
12+
<Database Name="MYAPP" Dir="/opt/myapp/data" Create="yes"/>
1813

19-
<Import File="${SOURCESPATH}" Recurse="1"/>
14+
<Import File="${SourceDir}" Flags="ck" Recurse="1"/>
15+
</Configuration>
2016
</Namespace>
2117

2218
</Manifest>
2319
}
2420

2521
ClassMethod setup(ByRef pVars, pLogLevel As %Integer = 3, pInstaller As %Installer.Installer, pLogger As %Installer.AbstractLogger) As %Status [ CodeMode = objectgenerator, Internal ]
2622
{
27-
Quit ##class(%Installer.Manifest).%Generate(%compiledclass, %code, "MyInstall")
23+
#; Let XGL document generate code for this method.
24+
Quit ##class(%Installer.Manifest).%Generate(%compiledclass, %code, "setup")
2825
}
2926

30-
}
27+
}

docker-compose.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
version: '2.4'
1+
version: '3.6'
22
services:
33
iris:
44
build: .
55
restart: always
6-
ports:
7-
- 52773:52773
6+
ports:
7+
- 51773
8+
- ${IRIS_PORT}:52773
9+
- 53773
10+
environment:
11+
- ISC_DATA_DIRECTORY=/ISC/irisconf.d
812
volumes:
913
- ~/iris.key:/usr/irissys/mgr/iris.key
14+
- ./ISC:/ISC
1015
- ./:/iris/app

irissession.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
#!/bin/bash
3+
4+
iris start $ISC_PACKAGE_INSTANCENAME quietly
5+
6+
cat << EOF | iris session $ISC_PACKAGE_INSTANCENAME -U %SYS
7+
do ##class(%SYSTEM.Process).CurrentDirectory("$PWD")
8+
Do ##class(Security.Users).UnExpireUserPasswords(\"*\")
9+
$@
10+
if '\$Get(sc) do ##class(%SYSTEM.Process).Process.Terminate(, 1)
11+
do ##class(SYS.Container).QuiesceForBundling()
12+
do ##class(SYS.Container).SetMonitorStateOK("irisowner")
13+
halt
14+
EOF
15+
16+
exit=$?
17+
18+
iris stop $ISC_PACKAGE_INSTANCENAME quietly
19+
20+
exit $exit

0 commit comments

Comments
 (0)