Skip to content

Commit f8f094e

Browse files
committed
homogenity between mini and all
1 parent 3424e0e commit f8f094e

2 files changed

Lines changed: 1 addition & 7 deletions

File tree

debuntu/all/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,4 @@ ENV catalyst_dir="/opt/catalyst/lib/cmake/catalyst-2.0"
144144
RUN export VERBOSE=1 \
145145
&& bash pdi/bin/build_and_run_all_tests
146146

147-
148-
149147
FROM main

debuntu/mini/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ ENV HOME=/home/ci
7272
USER ci:ci
7373
WORKDIR ${HOME}
7474

75-
## chmod -R o+rX .
7675
FROM main AS builder_catalyst
7776
USER root
7877

@@ -117,23 +116,20 @@ else
117116
fi
118117
EORUN
119118

120-
USER ci
121-
122119
FROM alpine/git AS pdidl
123120

124121
#RUN git -C /root clone --recurse-submodules https://github.com/pdidev/pdi.git /root/pdi
125122
RUN git -C /root clone -b catalyst-plugin --recurse-submodules https://github.com/francois-kitware/pdi /root/pdi
126123

127124
FROM main AS test
128-
125+
USER ci
129126
COPY --from=pdidl --chown=ci:ci /root/pdi /home/ci/pdi
130127
COPY --from=builder_catalyst --chown=ci:ci /opt/catalyst /opt/catalyst
131128

132129
WORKDIR ${HOME}
133130
## Add env varible for catalyst lib
134131
ENV LD_LIBRARY_PATH="/opt/catalyst/lib"
135132
ENV catalyst_dir="/opt/catalyst/lib/cmake/catalyst-2.0"
136-
## add to check if catalyst_dir is needed
137133

138134
RUN export VERBOSE=1 \
139135
&& bash pdi/bin/build_and_run_all_tests

0 commit comments

Comments
 (0)