Skip to content

Commit d7c8178

Browse files
committed
fix workdir
1 parent 224be7f commit d7c8178

7 files changed

Lines changed: 19 additions & 18 deletions

File tree

.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": "/irisrun/repo",
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"files.associations": {
3-
3+
44
"Dockerfile*": "dockerfile",
55
"iris.script": "objectscript"
66
},
@@ -12,7 +12,7 @@
1212
"service": "iris",
1313
"internalPort": 52773
1414
},
15-
"active": true
15+
"active": false
1616
},
1717
"sqltools.connections": [
1818
{

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ ARG IMAGE=intersystemsdc/iris-community
33
ARG IMAGE=intersystemsdc/iris-community:preview
44
FROM $IMAGE
55

6-
WORKDIR /home/irisowner/irisbuild
6+
WORKDIR /home/irisowner/dev
77

88
ARG TESTS=0
99
ARG MODULE="iris-python-template"
1010
ARG NAMESPACE="USER"
1111

1212
# create Python env
13-
ENV PYTHON_PATH=/usr/irissys/bin/irispython
14-
ENV SRC_PATH=/irisrun/repo
13+
## Embedded Python environment
1514
ENV IRISUSERNAME "SuperUser"
1615
ENV IRISPASSWORD "SYS"
1716
ENV IRISNAMESPACE "USER"
17+
ENV PYTHON_PATH=/usr/irissys/bin/
18+
ENV PATH "/usr/irissys/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/irisowner/bin"
1819

1920
## Start IRIS
2021

dev.md

Lines changed: 6 additions & 6 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
@@ -54,7 +54,7 @@ repo -r -n registry -url https://pm.community.intersystems.com/
5454

5555
## export a global in runtime into the repo
5656
```
57-
d $System.OBJ.Export("GlobalD.GBL","/irisrun/repo/src/gbl/GlobalD.xml")
57+
d $System.OBJ.Export("GlobalD.GBL","/home/irisowner/dev/src/gbl/GlobalD.xml")
5858
```
5959

6060
## create a web app in dockerfile
@@ -69,20 +69,20 @@ zn "%SYS" \
6969
set webProperties("iKnowEnabled") = 1 \
7070
set webProperties("DeepSeeEnabled") = 1 \
7171
set sc = ##class(Security.Applications).Create(webName, .webProperties) \
72-
write "Web application "_webName_" has been created!",!
72+
write "Web application "_webName_" has been created!",!
7373
```
7474

7575

7676

7777
```
78-
do $SYSTEM.OBJ.ImportDir("/opt/irisbuild/src",, "ck")
79-
```
78+
do $SYSTEM.OBJ.ImportDir("/home/irisowner/dev/src",, "ck")
79+
```
8080

8181

8282
### run tests described in the module
8383

8484
IRISAPP>zpm
85-
IRISAPP:zpm>load /irisrun/repo
85+
IRISAPP:zpm>load /home/irisowner/dev
8686
IRISAPP:zpm>test package-name
8787

8888
### install ZPM with one line

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
version: '3.6'
22
services:
33
iris:
4-
build:
4+
build:
55
context: .
66
dockerfile: Dockerfile
77
command: --check-caps false
88
restart: always
9-
ports:
9+
ports:
1010
- 1972
1111
- 55037:52773
1212
- 53773
1313
volumes:
14-
- ./:/irisrun/repo
14+
- ./:/home/irisowner/dev

iris.script

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
;do $System.OBJ.LoadDir("/opt/irisbuild/src","ck",,1)
1+
;do $System.OBJ.LoadDir("/home/irisowner/dev/src","ck",,1)
22

33
zn "%SYS"
44
Do ##class(Security.Users).UnExpireUserPasswords("*")
@@ -10,5 +10,5 @@
1010
do ##class(Security.Services).Modify("%Service_CallIn",.prop)
1111

1212
zn "USER"
13-
zpm "load /home/irisowner/irisbuild/ -v":1:1
13+
zpm "load /home/irisowner/dev/ -v":1:1
1414
halt

python/sample.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ def meanage(filename):
1919

2020
return str(mean_age)
2121

22-
print(meanage("/irisrun/repo/data/titanic.csv"))
22+
print(meanage("/home/irisowner/dev/data/titanic.csv"))

0 commit comments

Comments
 (0)