Skip to content

Commit 79d4213

Browse files
committed
change workdir to /home/irisowner/dev
1 parent 4df4174 commit 79d4213

File tree

6 files changed

+38
-19
lines changed

6 files changed

+38
-19
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
"service": "iris",
1212

13-
"workspaceFolder": "/home/irisowner/irisdev",
13+
"workspaceFolder": "/home/irisowner/dev",
1414

1515
// This provides the elements of the connection object which require different values when connecting to the workspace within the container,
1616
// versus those in .vscode/settings.json which apply when operating locally on the workspace files.

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"iris.script": "objectscript"
66
},
77
"objectscript.conn" :{
8-
"active": true,
8+
"active": false,
99
"ns": "IRISAPP",
1010
"username": "_SYSTEM",
1111
"password": "SYS",

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
ARG IMAGE=intersystemsdc/irishealth-community:2020.3.0.200.0-zpm
22
ARG IMAGE=intersystemsdc/iris-community:2020.4.0.547.0-zpm
33
ARG IMAGE=containers.intersystems.com/intersystems/iris:2021.1.0.215.0
4-
ARG IMAGE=intersystemsdc/iris-community:preview
54
ARG IMAGE=intersystemsdc/irishealth-community
65
ARG IMAGE=intersystemsdc/iris-community
6+
ARG IMAGE=intersystemsdc/iris-community:preview
77
FROM $IMAGE as builder
88

9-
WORKDIR /home/irisowner/irisdev
9+
WORKDIR /home/irisowner/dev
1010

1111
## install git
1212
## USER root
@@ -34,9 +34,9 @@ RUN --mount=type=bind,src=.,dst=. \
3434

3535

3636
FROM $IMAGE as final
37-
ADD --chown=${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} https://github.com/grongierisc/iris-docker-multi-stage-script/releases/latest/download/copy-data.py /home/irisowner/irisdev/copy-data.py
38-
#ADD https://github.com/grongierisc/iris-docker-multi-stage-script/releases/latest/download/copy-data.py /home/irisowner/irisdev/copy-data.py
37+
ADD --chown=${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} https://github.com/grongierisc/iris-docker-multi-stage-script/releases/latest/download/copy-data.py /home/irisowner/dev/copy-data.py
38+
#ADD https://github.com/grongierisc/iris-docker-multi-stage-script/releases/latest/download/copy-data.py /home/irisowner/dev/copy-data.py
3939

4040
RUN --mount=type=bind,source=/,target=/builder/root,from=builder \
4141
cp -f /builder/root/usr/irissys/iris.cpf /usr/irissys/iris.cpf && \
42-
python3 /home/irisowner/irisdev/copy-data.py -c /usr/irissys/iris.cpf -d /builder/root/
42+
python3 /home/irisowner/dev/copy-data.py -c /usr/irissys/iris.cpf -d /builder/root/

dev.md

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# useful commands
2-
## clean up docker
2+
## clean up docker
33
use it when docker says "There is no space left on device". It will remove built but not used images and other temporary files.
44
```
55
docker system prune -f
@@ -20,9 +20,13 @@ docker-compose up -d
2020

2121
## open iris terminal in docker
2222
```
23-
docker-compose exec iris iris session iris -U IRISAPP
23+
docker exec iris iris session iris -U IRISAPP
2424
```
2525

26+
27+
## import objectscirpt code
28+
29+
do $System.OBJ.LoadDir("/home/irisowner/dev/src","ck",,1)
2630
## map iris key from Mac home directory to IRIS in container
2731
- ~/iris.key:/usr/irissys/mgr/iris.key
2832

@@ -45,7 +49,7 @@ sudo chmod +x /usr/local/bin/docker-compose
4549
## load and test module
4650
```
4751
48-
zpm "load /home/irisowner/irisdev"
52+
zpm "load /home/irisowner/dev"
4953
5054
zpm "test dc-sample"
5155
```
@@ -57,7 +61,7 @@ repo -n registry -r -url https://test.pm.community.intersystems.com/registry/ -u
5761

5862
## get back to public zpm registry
5963
```
60-
repo -r -n registry -url https://pm.community.intersystems.com/
64+
repo -r -n registry -url https://pm.community.intersystems.com/ -user "" -pass ""
6165
```
6266

6367
## export a global in runtime into the repo
@@ -77,14 +81,14 @@ zn "%SYS" \
7781
set webProperties("iKnowEnabled") = 1 \
7882
set webProperties("DeepSeeEnabled") = 1 \
7983
set sc = ##class(Security.Applications).Create(webName, .webProperties) \
80-
write "Web application "_webName_" has been created!",!
84+
write "Web application "_webName_" has been created!",!
8185
```
8286

8387

8488

8589
```
86-
do $SYSTEM.OBJ.ImportDir("/opt/irisbuild/src",, "ck")
87-
```
90+
do $SYSTEM.OBJ.ImportDir("/opt/irisbuild/src",, "ck")
91+
```
8892

8993

9094
### run tests described in the module
@@ -96,3 +100,18 @@ IRISAPP:zpm>test package-name
96100
### install ZPM with one line
97101
// Install ZPM
98102
set $namespace="%SYS", name="DefaultSSL" do:'##class(Security.SSLConfigs).Exists(name) ##class(Security.SSLConfigs).Create(name) set url="https://pm.community.intersystems.com/packages/zpm/latest/installer" Do ##class(%Net.URLParser).Parse(url,.comp) set ht = ##class(%Net.HttpRequest).%New(), ht.Server = comp("host"), ht.Port = 443, ht.Https=1, ht.SSLConfiguration=name, st=ht.Get(comp("path")) quit:'st $System.Status.GetErrorText(st) set xml=##class(%File).TempFilename("xml"), tFile = ##class(%Stream.FileBinary).%New(), tFile.Filename = xml do tFile.CopyFromAndSave(ht.HttpResponse.Data) do ht.%Close(), $system.OBJ.Load(xml,"ck") do ##class(%File).Delete(xml)
103+
104+
105+
106+
107+
docker run --rm --name iris-sql -d -p 9091:1972 -p 9092:52773  -e IRIS_PASSWORD=demo -e IRIS_USERNAME=demo intersystemsdc/iris-community
108+
109+
110+
docker run --rm --name iris-ce -d -p 9091:1972 -p 9092:52773 -e IRIS_PASSWORD=demo -e IRIS_USERNAME=demo intersystemsdc/iris-community -a "echo 'zpm \"install webterminal\"' | iriscli"
111+
112+
113+
114+
docker run --rm --name iris-sql -d -p 9092:52773 containers.intersystems.com/intersystems/iris-community:2023.1.0.229.0
115+
116+
117+
docker run --rm --name iris-ce -d -p 9092:52773 containers.intersystems.com/intersystems/iris-community:2023.1.0.229.0

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ services:
1212
- 52773
1313
- 53773
1414
volumes:
15-
- ./:/home/irisowner/irisdev
15+
- ./:/home/irisowner/dev

iris.script

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
do ##class(Security.Services).Modify("%Service_CallIn",.prop)
1010

1111
// create IRISAPP namespace
12-
do $SYSTEM.OBJ.Load("/home/irisowner/irisdev/Installer.cls", "ck")
13-
set sc = ##class(App.Installer).setup()
12+
do $SYSTEM.OBJ.Load("/home/irisowner/dev/Installer.cls", "ck")
13+
set sc = ##class(App.Installer).setup()
1414

1515
// comment the line below for production images
1616
zpm "install passwordless"
1717
// load all the code of the project as a ZPM package
1818
zn "IRISAPP"
19-
20-
zpm "load /home/irisowner/irisdev/ -v":1:1
19+
20+
zpm "load /home/irisowner/dev/ -v":1:1
2121
halt

0 commit comments

Comments
 (0)