From 8f6ac09e377e58ebc7a74c2648430faeddd09675 Mon Sep 17 00:00:00 2001 From: ProjectBot Date: Mon, 13 May 2024 17:52:25 +0000 Subject: [PATCH 1/8] auto bump version --- module.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module.xml b/module.xml index 36d0abf..f86dfbe 100644 --- a/module.xml +++ b/module.xml @@ -2,7 +2,7 @@ MDX2JSON - 3.2.40 + 3.2.41 RESTful web api for MDX to JSON transformation (plus JSONP and XML/A) for InterSystems IRIS. Also provides information about DeepSee objects. module ./ From e67ca57d8610db25f66c98137ef309065bcc6567 Mon Sep 17 00:00:00 2001 From: SergeyMi37 Date: Mon, 13 May 2024 21:21:03 +0300 Subject: [PATCH 2/8] add docker --- Dockerfile | 16 ++++++++++++++++ docker-compose.yml | 20 ++++++++++++++++++++ iris.script | 5 +++++ 3 files changed, 41 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml create mode 100644 iris.script diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..938e2a4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,16 @@ +ARG IMAGE=intersystemsdc/iris-community +FROM $IMAGE + +USER root + +WORKDIR /opt/irisapp +RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /opt/irisapp +USER ${ISC_PACKAGE_MGRUSER} + +COPY MDX2JSON MDX2JSON +COPY module.xml module.xml +COPY iris.script /tmp/iris.script + +RUN iris start IRIS \ + && iris session IRIS < /tmp/iris.script \ + && iris stop IRIS quietly diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..365a1c6 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,20 @@ +version: '3.8' +services: + iris: + build: + context: . + dockerfile: Dockerfile +# restart: always +# command: --check-caps false --ISCAgent false + ports: + - 51663:1972 + - 52663:52773 + - 53773 + command: + - -a + - iris session iris -U%SYS '##class(Security.Users).UnExpireUserPasswords("*")' + - --check-caps false +# network_mode: "host" + volumes: + # - ~/iris.key:/usr/irissys/mgr/iris.key + - ./:/irisdev/app diff --git a/iris.script b/iris.script new file mode 100644 index 0000000..9a1e452 --- /dev/null +++ b/iris.script @@ -0,0 +1,5 @@ +;if $zf(-1,"echo ':!tail /usr/irissys/mgr/messages.log' >> ~/.iris_history") + +zpm "load /opt/irisapp/ -v":1 + +halt From 2a4d329e4562a8927eacc207a227865c31c7e6ca Mon Sep 17 00:00:00 2001 From: ProjectBot Date: Mon, 13 May 2024 18:21:34 +0000 Subject: [PATCH 3/8] auto bump version --- module.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module.xml b/module.xml index f86dfbe..d10a615 100644 --- a/module.xml +++ b/module.xml @@ -2,7 +2,7 @@ MDX2JSON - 3.2.41 + 3.2.42 RESTful web api for MDX to JSON transformation (plus JSONP and XML/A) for InterSystems IRIS. Also provides information about DeepSee objects. module ./ From 9598f18f0be04a21e74fd76698fc38e9273146fa Mon Sep 17 00:00:00 2001 From: SergeyMi37 Date: Mon, 13 May 2024 21:27:08 +0300 Subject: [PATCH 4/8] add docker --- Dockerfile | 2 +- docker-compose.yml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 938e2a4..ee34642 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG IMAGE=intersystemsdc/iris-community FROM $IMAGE -USER root +USER root WORKDIR /opt/irisapp RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /opt/irisapp diff --git a/docker-compose.yml b/docker-compose.yml index 365a1c6..dca9056 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,8 +4,6 @@ services: build: context: . dockerfile: Dockerfile -# restart: always -# command: --check-caps false --ISCAgent false ports: - 51663:1972 - 52663:52773 @@ -14,7 +12,5 @@ services: - -a - iris session iris -U%SYS '##class(Security.Users).UnExpireUserPasswords("*")' - --check-caps false -# network_mode: "host" volumes: - # - ~/iris.key:/usr/irissys/mgr/iris.key - ./:/irisdev/app From 62bbc651380846e67b25779ca09870d6a37e66bf Mon Sep 17 00:00:00 2001 From: SergeyMi37 Date: Mon, 13 May 2024 21:33:14 +0300 Subject: [PATCH 5/8] add docker --- module.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module.xml b/module.xml index d10a615..36d0abf 100644 --- a/module.xml +++ b/module.xml @@ -2,7 +2,7 @@ MDX2JSON - 3.2.42 + 3.2.40 RESTful web api for MDX to JSON transformation (plus JSONP and XML/A) for InterSystems IRIS. Also provides information about DeepSee objects. module ./ From c25566f76d285bdcdc49a3ba21578e09b21d129c Mon Sep 17 00:00:00 2001 From: ProjectBot Date: Mon, 13 May 2024 18:33:34 +0000 Subject: [PATCH 6/8] auto bump version --- module.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module.xml b/module.xml index 36d0abf..f86dfbe 100644 --- a/module.xml +++ b/module.xml @@ -2,7 +2,7 @@ MDX2JSON - 3.2.40 + 3.2.41 RESTful web api for MDX to JSON transformation (plus JSONP and XML/A) for InterSystems IRIS. Also provides information about DeepSee objects. module ./ From 725d1b24f71ab224b56f80921f522d1a7131841a Mon Sep 17 00:00:00 2001 From: Sergey Mikhaylenko Date: Mon, 13 May 2024 21:38:36 +0300 Subject: [PATCH 7/8] Update iris.script --- iris.script | 3 --- 1 file changed, 3 deletions(-) diff --git a/iris.script b/iris.script index 9a1e452..2c7e8b8 100644 --- a/iris.script +++ b/iris.script @@ -1,5 +1,2 @@ -;if $zf(-1,"echo ':!tail /usr/irissys/mgr/messages.log' >> ~/.iris_history") - zpm "load /opt/irisapp/ -v":1 - halt From 9f787faf3eb8b77c73b043fc75189bb737f5dd15 Mon Sep 17 00:00:00 2001 From: ProjectBot Date: Mon, 13 May 2024 18:38:46 +0000 Subject: [PATCH 8/8] auto bump version --- module.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module.xml b/module.xml index f86dfbe..d10a615 100644 --- a/module.xml +++ b/module.xml @@ -2,7 +2,7 @@ MDX2JSON - 3.2.41 + 3.2.42 RESTful web api for MDX to JSON transformation (plus JSONP and XML/A) for InterSystems IRIS. Also provides information about DeepSee objects. module ./