Skip to content

Commit fb2030c

Browse files
committed
Add Dockerfile and docker-compose changes
1 parent 1cb28d6 commit fb2030c

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ ENV LD_LIBRARY_PATH=${ISC_PACKAGE_INSTALLDIR}/bin:${LD_LIBRARY_PATH}
1212
ENV PATH "/home/irisowner/.local/bin:/usr/irissys/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/irisowner/bin"
1313

1414
COPY . .
15+
16+
RUN pip install -r requirements-dev.txt
17+
18+

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ services:
1515
- --check-caps false
1616
volumes:
1717
- ./:/irisdev/app
18-
- ./entrypoint.sh:/docker-entrypoint-initdb.d/entrypoint.sh
19-
- ./src/grongier:/usr/irissys/mgr/python/grongier
18+
- ./src/grongier:/usr/irissys/mgr/python/grongier
19+
entrypoint: ["sh", "/irisdev/app/entrypoint.sh"]

entrypoint.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
#!/bin/bash
22

3-
set -m
3+
# start iris
4+
/iris-main "$@" &
45

56
/usr/irissys/dev/Cloud/ICM/waitISC.sh
67

8+
alias iop='irispython -m grongier.pex._cli'
9+
710
# init iop
811
iop --init
912

@@ -14,4 +17,5 @@ iop -m /irisdev/app/demo/python/reddit/settings.py
1417
iop --default PEX.Production
1518

1619
# start production
17-
iop --start --detach
20+
iop --start
21+

merge.cpf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ CreateResource:Name=%DB_IRISAPP_CODE,Description="IRISAPP_CODE database"
55
CreateDatabase:Name=IRISAPP_CODE,Directory=/usr/irissys/mgr/IRISAPP_CODE
66
CreateNamespace:Name=IRISAPP,Globals=IRISAPP_DATA,Routines=IRISAPP_CODE,Interop=1
77
ModifyService:Name=%Service_CallIn,Enabled=1,AutheEnabled=48
8-
ModifyUser:Name=SuperUser,PasswordHash=a31d24aecc0bfe560a7e45bd913ad27c667dc25a75cbfd358c451bb595b6bd52bd25c82cafaa23ca1dd30b3b4947d12d3bb0ffb2a717df29912b743a281f97c1,0a4c463a2fa1e7542b61aa48800091ab688eb0a14bebf536638f411f5454c9343b9aa6402b4694f0a89b624407a5f43f0a38fc35216bb18aab7dc41ef9f056b1,10000,SHA512
8+
ModifyUser:Name=SuperUser,ChangePassword=0,PasswordHash=a31d24aecc0bfe560a7e45bd913ad27c667dc25a75cbfd358c451bb595b6bd52bd25c82cafaa23ca1dd30b3b4947d12d3bb0ffb2a717df29912b743a281f97c1,0a4c463a2fa1e7542b61aa48800091ab688eb0a14bebf536638f411f5454c9343b9aa6402b4694f0a89b624407a5f43f0a38fc35216bb18aab7dc41ef9f056b1,10000,SHA512

requirements-dev.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ dacite
33
xmltodict
44
intersystems_iris@ https://github.com/intersystems-community/intersystems-irispython/releases/download/3.7.2/intersystems_iris-3.7.2-py3-none-any.whl
55
requests
6+
dataclasses-json

0 commit comments

Comments
 (0)