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

Fix docker build #9

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix docker build #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f194f1a
Update env
grongierisc Nov 30, 2020
721fd49
Enable Interop and DeepSee
grongierisc Nov 30, 2020
263d84a
Bump version iris
grongierisc Nov 30, 2020
d75ba21
Update module version
grongierisc Nov 30, 2020
a99287a
Update Vscode settings
grongierisc Nov 30, 2020
1db916b
Add load module in docker
grongierisc Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
IRIS_PORT=52775
DOCKERFILE=Dockerfile-zpm-samplesbi
DOCKERFILE=Dockerfile-20192
DOCKERFILE=Dockerfile-zpm
DOCKERFILE=Dockerfile-web
DOCKERFILE=Dockerfile
15 changes: 10 additions & 5 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@

"Dockerfile*": "dockerfile",
},
"objectscript.conn.active": true,
"objectscript.conn.version": 3,
"objectscript.conn.ns": "IRISAPP",
"objectscript.conn.port": 52775 ,
"objectscript.export.addCategory": true
"objectscript.conn" :{
"ns": "IRISAPP",
"username": "_SYSTEM",
"password": "SYS",
"docker-compose": {
"service": "iris",
"internalPort": 52773
},
"active": true,
}

}
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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:2020.4.0.524.0-zpm
FROM $IMAGE

USER root
Expand All @@ -19,8 +20,7 @@ RUN mkdir -p /tmp/deps \


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

# running IRIS and open IRIS termninal in USER namespace
Expand All @@ -32,7 +32,7 @@ RUN \
do $SYSTEM.OBJ.Load("Installer.cls", "ck") \
set sc = ##class(App.Installer).setup() \
Do $system.OBJ.Load("/tmp/deps/zpm.xml", "ck") \
zn "IRISAPP"
zn "IRISAPP"


# bringing the standard shell back
Expand Down
2 changes: 1 addition & 1 deletion Installer.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ XData setup
<Default Name="app" Value="irisapp" />
<Default Name="restapp" Value="/rest-test" />

<Namespace Name="${Namespace}" Code="${Namespace}" Data="${Namespace}" Create="yes" Ensemble="no">
<Namespace Name="${Namespace}" Code="${Namespace}" Data="${Namespace}" Create="yes" Ensemble="1">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a minor nit, but I'd not add the pile of mappings for interoperability if we don't have to.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right, but but I don't know if we need Ensemble for analytics, if so, I can uncheck this.
And when I have time, we can clean this installer, we don't need and co.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure we need the whole %Installer in the first place (having zpm as a more lightweight solution), but it's sort of part of the template for sizeable samples. By any means, Ensemble is not required for analytics.


<Configuration>
<Database Name="${Namespace}" Dir="/opt/${app}/data" Create="yes" Resource="%DB_${Namespace}"/>
Expand Down
7 changes: 7 additions & 0 deletions irissession.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ if '\$Get(sc) do ##class(%SYSTEM.Process).Terminate(, 1)
zn "%SYS"
do ##class(SYS.Container).QuiesceForBundling()
Do ##class(Security.Users).UnExpireUserPasswords("*")
Set app = \$System.CSP.GetDefaultApp("IRISAPP") _ "/"
Do EnableIKnow^%SYS.cspServer(app)
Do EnableDeepSee^%SYS.cspServer(app)
zn "IRISAPP"
zpm
load "/opt/irisapp"
q
halt
EOF

Expand Down
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.1</Version>
<Version>1.0.2</Version>
<Packaging>module</Packaging>
<SourcesRoot>src</SourcesRoot>
<Resource Name="Aviation.PKG"/>
Expand Down