Skip to content

Commit 40d91ba

Browse files
committed
In docker build, add /usr/local/lib to ld search path.
1 parent c883406 commit 40d91ba

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.github/workflows/deploy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ jobs:
3838
run: ./cmbenv -c docker-py${{ matrix.python }}-debian-${{ matrix.mpi }}
3939

4040
- name: Set tag name
41-
run: tag=$(echo "${GITHUB_REF}" | sed -e 's/.*\/\(v.*\)/\1/') && echo "TAGNAME=${tag}-${{ matrix.mpi }}" >> $GITHUB_ENV
41+
run: tag=$(echo "${GITHUB_REF}" | sed -e 's/.*\/\(v.*\)/\1/') && echo "TAGNAME=${tag}" >> $GITHUB_ENV
4242

4343
- name: Build Docker Image
44-
run: docker build -t hpc4cmb/cmbenv:${TAGNAME} -f Dockerfile_docker-py${{ matrix.python }}-debian-${{ matrix.mpi }} .
44+
run: docker build -t hpc4cmb/cmbenv-${{ matrix.mpi }}:${TAGNAME} -f Dockerfile_docker-py${{ matrix.python }}-debian-${{ matrix.mpi }} .
4545

4646
- name: Test Docker Image
47-
run: docker run hpc4cmb/cmbenv:${TAGNAME} python -c 'import toast.tests; toast.tests.run()'
47+
run: docker run hpc4cmb/cmbenv-${{ matrix.mpi }}:${TAGNAME} python -c 'import toast.tests; toast.tests.run()'
4848

4949
- name: Tag Latest
50-
run: docker tag hpc4cmb/cmbenv:${TAGNAME} hpc4cmb/cmbenv:latest
50+
run: docker tag hpc4cmb/cmbenv-${{ matrix.mpi }}:${TAGNAME} hpc4cmb/cmbenv-${{ matrix.mpi }}:latest
5151

5252
- name: Push Docker Image
53-
run: echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin && docker push hpc4cmb/cmbenv:${TAGNAME} && docker push hpc4cmb/cmbenv:latest
53+
run: echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin && docker push hpc4cmb/cmbenv-${{ matrix.mpi }}:${TAGNAME} && docker push hpc4cmb/cmbenv-${{ matrix.mpi }}:latest
5454

5555
toastdeps:
5656
name: TOAST Dependencies Python ${{ matrix.python }}

templates/docker-debian.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ RUN apt-get -y update \
2424
xvfb \
2525
&& rm -fr /var/lib/apt/lists/*
2626

27+
# Ensure that the lib directory of our install prefix
28+
# is in the linker search path.
29+
30+
RUN echo "@AUX_PREFIX@/lib" > /etc/ld.so.conf.d/local.conf && ldconfig
31+
2732
# Set up locales
2833

2934
ENV LANG C.UTF-8

0 commit comments

Comments
 (0)