Skip to content

Commit

Permalink
Merge pull request #76 from gitter-lab/fix-docker
Browse files Browse the repository at this point in the history
Fix Docker image
  • Loading branch information
agitter authored Jul 11, 2024
2 parents b2a5a67 + 2fb2dee commit 34336be
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/install-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ jobs:
run: docker pull agitter/singe:tmp
# Docker image build fails
# The repository 'http://deb.debian.org/debian stretch Release' does no longer have a Release file.
# - name: Build Docker image
# uses: docker/build-push-action@v1
# with:
# username: ${{ secrets.DOCKER_USERNAME }}
# password: ${{ secrets.DOCKER_PASSWORD }}
# path: .
# dockerfile: docker/Dockerfile
# repository: agitter/singe
# tags: tmp
# cache_froms: agitter/singe:tmp
# add_git_labels: true
# # Only push when running on the master branch
# push: ${{ github.ref == 'refs/heads/master' }}
- name: Build Docker image
uses: docker/build-push-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
path: .
dockerfile: docker/Dockerfile
repository: agitter/singe
tags: tmp
cache_froms: agitter/singe:tmp
add_git_labels: true
# Only push when running on the master branch
push: ${{ github.ref == 'refs/heads/master' }}
- name: Test SINGE
run: |
# Store the md5sums of the tracked source files before running tests in the Docker image
Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# MATLAB R2018a in a Debian environment
FROM amarburg/matlab-runtime:R2018a

RUN echo "deb http://archive.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list
RUN apt-get update && \
apt-get -y install libxt6 bzip2 && \
rm -rf /var/lib/apt/lists/*
Expand All @@ -9,7 +10,7 @@ RUN apt-get update && \
# Python is only needed for testing SINGE and could be removed from the base
# to reduce the image size
ENV PATH /opt/conda/bin:$PATH
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.6.14-Linux-x86_64.sh -O ~/miniconda.sh && \
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.6.14-Linux-x86_64.sh --no-check-certificate -O ~/miniconda.sh && \
/bin/bash ~/miniconda.sh -b -p /opt/conda && \
rm ~/miniconda.sh && \
/opt/conda/bin/conda clean --all && \
Expand Down
4 changes: 3 additions & 1 deletion tests/environment.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
name: singe-test
dependencies:
- h5py=2.10.0
- numpy=1.16.3
- pip=19.1
- pip=19.1.1
- python=3.7.11
- scipy=1.2.1
- pip:
- csvdiff==0.3.3
Expand Down

0 comments on commit 34336be

Please sign in to comment.