Skip to content

Commit

Permalink
Docker
Browse files Browse the repository at this point in the history
  • Loading branch information
lobis committed Dec 1, 2023
1 parent 28ec957 commit 5ba506b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .binder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ghcr.io/lobis/geant4:binder
FROM ghcr.io/lobis/geant4-python-application:latest

ARG NB_USER=jovyan
ARG NB_USER=user
ARG NB_UID=1000
ENV USER ${NB_USER}
ENV NB_UID ${NB_UID}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:
cancel-in-progress: true

env:
IMAGE_NAME: ghcr.io/lobis/geant4:${{ github.event.inputs.tag }}
IMAGE_NAME: ghcr.io/lobis/geant4-python-application:${{ github.event.inputs.tag }}

jobs:
docker-image:
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Test image
run: |
docker run --rm ${{ env.IMAGE_NAME }} -c 'from geant4 import Application; Application().setup_manager()'
docker run --rm ${{ env.IMAGE_NAME }} -c 'from geant4_python_application import Application; Application().setup_manager()'
- name: Publish
run: docker push ${{ env.IMAGE_NAME }}
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ jobs:

- name: Install Geant4 via conda
run: |
conda env list
mamba env list
mamba install -c conda-forge geant4=${{ matrix.geant4-version }}
conda list
mamba list
- name: Install additional dependencies (ubuntu)
if: matrix.platform == 'ubuntu-latest'
Expand All @@ -66,13 +66,16 @@ jobs:
- name: Install additional dependencies (macos)
if: matrix.platform == 'macos-latest'
run: |
conda env list
mamba env list
mamba install -c conda-forge zlib
conda list
mamba list
- name: pip
- name: pip install the package
run: |
CMAKE_PREFIX_PATH=${CONDA_PREFIX}
echo ${CONDA_PREFIX}
export CMAKE_PREFIX_PATH=${CONDA_PREFIX}
mamba env list
mamba list
pip install .[test]
- name: Check imports
Expand Down

0 comments on commit 5ba506b

Please sign in to comment.