Skip to content

Commit 888c185

Browse files
committed
working docker
1 parent 69bde86 commit 888c185

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.github/docker/ubuntu-20.04.Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,15 @@ RUN apt-get update \
5252

5353
# Install hwloc
5454
COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
55-
RUN /opt/umf/install_hwloc.sh \
56-
&& ldconfig \
57-
&& rm -f /opt/umf/install_hwloc.sh
55+
RUN apt-get update \
56+
&& apt-get install -y dos2unix libtool \
57+
&& dos2unix /opt/umf/install_hwloc.sh \
58+
&& bash -x /opt/umf/install_hwloc.sh \
59+
&& ldconfig \
60+
&& rm -f /opt/umf/install_hwloc.sh
5861

5962
# Prepare a dir (accessible by anyone)
60-
RUN mkdir --mode 777 /opt/umf/
63+
RUN mkdir -p --mode 777 /opt/umf/
6164

6265
# Additional dependencies (installed via pip)
6366
COPY third_party/requirements.txt /opt/umf/requirements.txt

third_party/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ sphinxcontrib_htmlhelp==2.0.1
1313
sphinxcontrib_serializinghtml==1.1.5
1414
sphinxcontrib_qthelp==1.0.3
1515
breathe==4.35.0
16-
sphinx==8.1.3
17-
sphinx_book_theme==1.1.3
16+
sphinx==7.1.2
17+
sphinx_book_theme==1.0.1
1818
# Spelling check in documentation
1919
pyenchant==3.2.2
2020
sphinxcontrib-spelling==8.0.0

0 commit comments

Comments
 (0)