Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix problems in image build #15

Merged
merged 5 commits into from
Oct 11, 2023
Merged

Fix problems in image build #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a75d7b
version indepenent
r-cemper Oct 10, 2023
7aa43db
actual ports, no license
r-cemper Oct 10, 2023
944b535
bump version
r-cemper Oct 10, 2023
418ded6
repo has changed
r-cemper Oct 10, 2023
16ffb87
enable Analytics for IRISAPP + actual image
r-cemper Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 9 additions & 10 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
ARG IMAGE=intersystems/iris:2019.1.0S.111.0
ARG IMAGE=store/intersystems/iris-community:2019.3.0.309.0
ARG IMAGE=store/intersystems/iris-community:2019.4.0.379.0
ARG IMAGE=intersystemsdc/iris-community:latest
FROM $IMAGE

USER root

WORKDIR /opt/irisapp
RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /opt/irisapp


USER irisowner

RUN mkdir -p /tmp/deps \

&& cd /tmp/deps \

&& wget -q https://pm.community.intersystems.com/packages/zpm/latest/installer -O zpm.xml

# RUN mkdir -p /tmp/deps \
# && cd /tmp/deps \
# && wget -q https://pm.community.intersystems.com/packages/zpm/latest/installer -O zpm.xml

COPY Installer.cls .
COPY src src
COPY gbl src/gbl
# COPY gbl src/gbl
COPY irissession.sh /

# running IRIS and open IRIS termninal in USER namespace
Expand All @@ -29,12 +26,14 @@ SHELL ["/irissession.sh"]
# each row is what you type in terminal and Enter
# zpm "install webterminal"
RUN \
zn "%SYS" \
do $SYSTEM.OBJ.Load("Installer.cls", "ck") \
set sc = ##class(App.Installer).setup() \
Do $system.OBJ.Load("/tmp/deps/zpm.xml", "ck") \
set sc=##class(Security.Applications).Get("/csp/irisapp",.par) \
set par("DeepSeeEnabled")=1 \
set sc=##class(Security.Applications).Modify("/csp/irisapp",.par) \
zn "IRISAPP"


# bringing the standard shell back
SHELL ["/bin/bash", "-c"]
CMD [ "-l", "/usr/irissys/mgr/messages.log" ]
8 changes: 4 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ services:
context: .
dockerfile: ${DOCKERFILE:-Dockerfile}
restart: always
command: --ISCAgent false
ports:
- 51773
- ${IRIS_PORT}:52773
- 41773:1972
- 42773:52773
- 53773
volumes:
- ~/iris.key:/usr/irissys/mgr/iris.key
- ./:/irisdev/app
- ./src/csp:/usr/irissys/mgr/csp/irisapp
- ./src/csp:/usr/irissys/mgr/csp/irisapp
2 changes: 1 addition & 1 deletion module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Document name="samples-aviation.ZPM">
<Module>
<Name>samples-aviation</Name>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<Description>Provides sample data for use in exploring InterSystems IRIS Text Analytics capabilities. Also includes sample analytics model elements.</Description>
<Packaging>module</Packaging>
<SourcesRoot>src</SourcesRoot>
Expand Down