Skip to content

Commit 0010d32

Browse files
committed
fix build
1 parent 0d517b5 commit 0010d32

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

.vscode/settings.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@
77
"username": "_SYSTEM",
88
"password": "SYS",
99
"ns": "REGISTRY",
10-
"port": 52773,
11-
"addCategory": true,
10+
"host": "localhost",
11+
"port": 52774,
1212
"links": {
1313
"Swagger spec": "http://${host}:${port}/registry/_spec",
1414
"All Packages": "http://${host}:${port}/registry/packages/-/all"
1515
}
16+
},
17+
"objectscript.export": {
18+
"folder": "src",
19+
"addCategory": true
1620
}
1721
}

Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
FROM containers.intersystems.com/intersystems/iris-community:2022.1.0.164.0
22

3+
WORKDIR /opt/registry
4+
35
USER root
46

5-
WORKDIR /opt/zpm
6-
RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} .
7+
RUN chown irisowner:irisowner .
78

89
USER irisowner
910

10-
COPY Installer.cls SQLPriv.xml ./
11-
COPY src src
12-
COPY zpm-registry.yaml /usr/irissys/
13-
RUN VERSION=$(grep -oP '(?<=<Version>).*?(?=</Version>)' module.xml) && \
14-
sed -i "s/Parameter VERSION.*/Parameter VERSION = \"${VERSION}\";/" ./src/CLS/ZPM/Registry.cls
11+
COPY --chown=irisowner:irisowner . .
1512

16-
RUN \
13+
RUN \
14+
VERSION=$(sed -n 's|.*<Version>\(.*\)</Version>.*|\1|p' module.xml | head -1) && \
15+
sed -i 's|^Parameter VERSION .*$|Parameter VERSION = "'"$VERSION"'";|g' \
16+
./src/cls/ZPM/Registry.cls && \
1717
iris start ${ISC_PACKAGE_INSTANCENAME} && \
1818
/bin/echo -e "" \
1919
" zn \"%SYS\"" \

0 commit comments

Comments
 (0)