Skip to content

Commit

Permalink
Update container files
Browse files Browse the repository at this point in the history
* activate parpe python environment by default
* fix git_archival.txt / setuptools_scm
* avoid unnecessary full rebuilds when modifying Dockerfile
  • Loading branch information
dweindl committed Dec 2, 2024
1 parent ec0126f commit 23ef1b7
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 12 deletions.
4 changes: 0 additions & 4 deletions .git_archival.txt

This file was deleted.

1 change: 1 addition & 0 deletions .git_archival.txt
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
.git_archival.txt export-subst
python/.git_archival.txt export-subst

4 changes: 2 additions & 2 deletions .github/workflows/deploy_dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ jobs:
if: needs.check-secret.outputs.secrets-defined == 'true'
steps:
- uses: actions/checkout@master
- run: git archive -v -o container/charliecloud/parpe_base/parpe.tar.gz --format=tar.gz HEAD
- run: git archive -v -o container/charliecloud/container_files/parpe.tar.gz --format=tar.gz HEAD
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: dweindl/parpe
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
workdir: container/charliecloud/parpe_base/
workdir: container/charliecloud/
dockerfile: Dockerfile
tag_names: true
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:24.04

COPY . /container-files
COPY /container_files /container-files

RUN /container-files/install.sh && rm -rf /tmp && mkdir /tmp

Expand All @@ -9,7 +9,7 @@ ENV CC clang
ENV CXX clang++
ENV OMPI_CC clang
ENV OMPI_CXX clang++
RUN /container-files/install_parpe.sh
RUN /container-files/install_parpe.sh && echo "source /parPE/build/venv/bin/activate" >> /etc/bash.bashrc

ENV PARPE_DIR "/parPE"

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions doc/parpe_with_charliecloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ This will create the parPE base image *from parPE from github*
takes about 10'):

```shell
git archive -v -o container/charliecloud/parpe_base/parpe.tar.gz --format=tar.gz HEAD
cd container/charliecloud/parpe_base
git archive -v -o container/charliecloud/container_files/parpe.tar.gz --format=tar.gz HEAD
cd container/charliecloud/
ch-build -t parpe .
```

Expand Down
2 changes: 1 addition & 1 deletion misc/venv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ if [[ ! -d "${venv_dir}" ]]; then

# install parPE
cd "${parpe_root}/python"
pip3 install -e .
pip3 install -vvve .
#pip3 install https://github.com/ICB-DCM/PEtab/archive/develop.zip
fi

0 comments on commit 23ef1b7

Please sign in to comment.