Skip to content

Commit 26123b5

Browse files
committed
Dockerfile update
1 parent 10fe390 commit 26123b5

2 files changed

Lines changed: 9 additions & 19 deletions

File tree

Dockerfile

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
1-
ARG IMAGE=store/intersystems/iris-community:2020.1.0.204.0
2-
ARG IMAGE=intersystemsdc/iris-community:2020.1.0.209.0-zpm
3-
ARG IMAGE=intersystemsdc/iris-community:2020.2.0.204.0-zpm
41
ARG IMAGE=intersystemsdc/irishealth-community:2020.3.0.200.0-zpm
5-
ARG IMAGE=intersystemsdc/iris-community:2020.3.0.221.0-zpm
62
ARG IMAGE=intersystemsdc/iris-community:2020.4.0.547.0-zpm
73
ARG IMAGE=containers.intersystems.com/intersystems/iris:2021.1.0.215.0
84
ARG IMAGE=intersystemsdc/iris-community
95
FROM $IMAGE
106

11-
USER root
12-
13-
WORKDIR /opt/irisbuild
14-
RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /opt/irisbuild
15-
USER ${ISC_PACKAGE_MGRUSER}
7+
WORKDIR /home/irisowner/irisbuild
168

17-
#COPY Installer.cls .
18-
COPY src src
19-
COPY Installer.cls Installer.cls
20-
COPY module.xml module.xml
21-
COPY iris.script iris.script
9+
ARG TESTS=0
2210

23-
RUN iris start IRIS \
24-
&& iris session IRIS < iris.script \
25-
&& iris stop IRIS quietly
11+
RUN --mount=type=bind,src=.,dst=. \
12+
iris start IRIS && \
13+
iris session IRIS < iris.script && \
14+
([ $TESTS -eq 0 ] || iris session iris "##class(%ZPM.PackageManager).Shell(\"test $MODULE -v -only\",1,1)") && \
15+
iris stop IRIS quietly

iris.script

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
Do ##class(Security.Users).UnExpireUserPasswords("*")
44

55
// create IRISAPP namespace
6-
do $SYSTEM.OBJ.Load("/opt/irisbuild/Installer.cls", "ck")
6+
do $SYSTEM.OBJ.Load("/home/irisowner/irisbuild/Installer.cls", "ck")
77
set sc = ##class(App.Installer).setup()
88

99
// load all the code of the project as a ZPM package
1010
zn "IRISAPP"
11-
zpm "load /opt/irisbuild/ -v":1:1
11+
zpm "load /home/irisowner/irisbuild/ -v":1:1
1212
halt

0 commit comments

Comments
 (0)