Skip to content

Commit

Permalink
Fix Git safe directories in all Docker files
Browse files Browse the repository at this point in the history
  • Loading branch information
pzehner committed Jan 31, 2024
1 parent c963d8f commit 22c44a4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
2 changes: 2 additions & 0 deletions docker/cuda/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ RUN apt-get update && apt-get install -y \

ENV FFTWDIR "/usr"

run git config --global --add safe.directory "*"

RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
KEYDUMP_FILE=keydump && \
wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE} && \
Expand Down
4 changes: 4 additions & 0 deletions docker/hip/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ RUN apt-get update && apt-get install -y \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

ENV FFTWDIR "/usr"

ENV PATH=/opt/rocm/bin:$PATH
ENV LD_LIBRARY_PATH /opt/rocm/hipfft/lib:$LD_LIBRARY_PATH
ENV CMAKE_PREFIX_PATH /opt/rocm/hip/:/opt/rocm/:$CMAKE_PREFIX_PATH

run git config --global --add safe.directory "*"

RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
KEYDUMP_FILE=keydump && \
wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE} && \
Expand Down
2 changes: 2 additions & 0 deletions docker/openmp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ RUN apt-get update && apt-get install -y \

ENV FFTWDIR "/usr"

run git config --global --add safe.directory "*"

ARG GCC_VERSION=8
RUN echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main" >> /etc/apt/sources.list && \
echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe" >> /etc/apt/sources.list && \
Expand Down
3 changes: 1 addition & 2 deletions docker/sycl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ RUN apt-get update && apt-get install -y \

ENV FFTWDIR "/usr"

RUN git config --global --add safe.directory '/work' && \
git config --global --add safe.directory '/work/tpls/kokkos'
run git config --global --add safe.directory "*"

RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
KEYDUMP_FILE=keydump && \
Expand Down

0 comments on commit 22c44a4

Please sign in to comment.