diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 813a361..ac16824 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -10,7 +10,7 @@ "service": "iris", - "workspaceFolder": "/irisrun/repo", + "workspaceFolder": "/home/irisowner/dev", // This provides the elements of the connection object which require different values when connecting to the workspace within the container, // versus those in .vscode/settings.json which apply when operating locally on the workspace files. diff --git a/Dockerfile b/Dockerfile index 6f79801..21a6929 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG IMAGE=intersystemsdc/irishealth-community ARG IMAGE=intersystemsdc/iris-community FROM $IMAGE -WORKDIR /home/irisowner/irisbuild +WORKDIR /home/irisowner/dev ARG TESTS=0 ARG MODULE="objectscript-template" diff --git a/dev.md b/dev.md index 6c69388..37152bf 100644 --- a/dev.md +++ b/dev.md @@ -1,5 +1,5 @@ # useful commands -## clean up docker +## clean up docker use it when docker says "There is no space left on device". It will remove built but not used images and other temporary files. ``` docker system prune -f @@ -54,7 +54,7 @@ repo -r -n registry -url https://pm.community.intersystems.com/ ## export a global in runtime into the repo ``` -d $System.OBJ.Export("GlobalD.GBL","/irisrun/repo/src/gbl/GlobalD.xml") +d $System.OBJ.Export("GlobalD.GBL","/home/irisowner/dev/src/gbl/GlobalD.xml") ``` ## create a web app in dockerfile @@ -69,20 +69,20 @@ zn "%SYS" \ set webProperties("iKnowEnabled") = 1 \ set webProperties("DeepSeeEnabled") = 1 \ set sc = ##class(Security.Applications).Create(webName, .webProperties) \ - write "Web application "_webName_" has been created!",! + write "Web application "_webName_" has been created!",! ``` ``` -do $SYSTEM.OBJ.ImportDir("/opt/irisbuild/src",, "ck") -``` +do $SYSTEM.OBJ.ImportDir("/home/irisowner/dev/src",, "ck") +``` ### run tests described in the module IRISAPP>zpm -IRISAPP:zpm>load /irisrun/repo +IRISAPP:zpm>load /home/irisowner/dev IRISAPP:zpm>test package-name ### install ZPM with one line @@ -91,8 +91,8 @@ IRISAPP:zpm>test package-name ## add git -USER root +USER root RUN apt update && apt-get -y install git - + USER ${ISC_PACKAGE_MGRUSER} diff --git a/docker-compose.yml b/docker-compose.yml index 5a0a647..af5427b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,13 @@ version: '3.6' services: iris: - build: + build: context: . dockerfile: Dockerfile restart: always - command: --check-caps false - ports: + ports: - 1972 - 52773 - 53773 volumes: - - ./:/irisrun/repo + - ./:/home/irisowner/dev diff --git a/iris.script b/iris.script index b2e3caf..cbf6fa4 100755 --- a/iris.script +++ b/iris.script @@ -1,4 +1,4 @@ - ;do $System.OBJ.LoadDir("/opt/irisbuild/src","ck",,1) + ;do $System.OBJ.LoadDir("/home/irisowner/dev/src","ck",,1) ;disabling password expire for development purposes zn "%SYS" @@ -10,7 +10,8 @@ set prop("AutheEnabled")=48 do ##class(Security.Services).Modify("%Service_CallIn",.prop) + zpm "install passwordless" ; importing the source code of the repository as ZPM module zn "USER" - zpm "load /home/irisowner/irisbuild/ -v":1:1 + zpm "load /home/irisowner/dev -v":1:1 halt