Skip to content

Commit 362fa8d

Browse files
committed
chore: reorder commands and cleanup
This also fixes the ability to run `make` commands again, since we're in the correct `WORKDIR` after the compilation step. Signed-off-by: Mike Fiedler <miketheman@gmail.com>
1 parent ec39d21 commit 362fa8d

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

Dockerfile

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ ENV PYTHONPATH /app
1313
# test dependencies.
1414
ARG DEVEL=no
1515

16-
# Copy local code to the container image.
17-
WORKDIR /app
18-
1916
# Install System level requirements, this is done before everything else
2017
# because these are rarely ever going to change.
2118
RUN set -x \
@@ -27,15 +24,17 @@ RUN set -x \
2724
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2825

2926
# Install pycdc and pycdas...
30-
RUN git clone "https://github.com/zrax/pycdc.git"
31-
32-
WORKDIR ./pycdc
33-
RUN cmake .
34-
RUN cmake --build . --config release
35-
RUN mv ./pycdc /usr/local/bin
36-
RUN mv ./pycdas /usr/local/bin
37-
RUN rm -rf ./pycdc
27+
WORKDIR /tmp
28+
RUN git clone "https://github.com/zrax/pycdc.git" && \
29+
cd pycdc && \
30+
cmake . && \
31+
cmake --build . --config release && \
32+
mv ./pycdc /usr/local/bin && \
33+
mv ./pycdas /usr/local/bin && \
34+
cd .. && rm -rf ./pycdc
3835

36+
# Copy local code to the container image.
37+
WORKDIR /app
3938
# Copy in requirements files
4039
COPY ./requirements ./requirements
4140

0 commit comments

Comments
 (0)