From 5ba7c2e4b2ee87e6bb26f2c1464e61d9be0d08ca Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Fri, 15 Mar 2024 17:51:07 +0100 Subject: [PATCH 1/5] packaging --- .github/workflows/v2dl3-eventdisplay-packaging.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/v2dl3-eventdisplay-packaging.yml b/.github/workflows/v2dl3-eventdisplay-packaging.yml index 193f3c6..3813875 100644 --- a/.github/workflows/v2dl3-eventdisplay-packaging.yml +++ b/.github/workflows/v2dl3-eventdisplay-packaging.yml @@ -36,6 +36,11 @@ jobs: else echo "BUILD_BRANCH=${GITHUB_REF#refs/heads/}" >> "$GITHUB_ENV" fi + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Log in to the Container registry uses: docker/login-action@v3 @@ -52,6 +57,7 @@ jobs: type=ref,event=pr,suffix=-v2dl3-eventdisplay type=semver,pattern={{major}}.{{minor}}.{{patch}},suffix=-v2dl3-eventdisplay images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + flavor: latest=true - name: Build and push Docker image uses: docker/build-push-action@v5 From 738b7967c78d26a6bfaa525978bb055afe56bf69 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Fri, 15 Mar 2024 17:53:35 +0100 Subject: [PATCH 2/5] meta --- .github/workflows/v2dl3-eventdisplay-packaging.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/v2dl3-eventdisplay-packaging.yml b/.github/workflows/v2dl3-eventdisplay-packaging.yml index 3813875..adcd824 100644 --- a/.github/workflows/v2dl3-eventdisplay-packaging.yml +++ b/.github/workflows/v2dl3-eventdisplay-packaging.yml @@ -56,6 +56,8 @@ jobs: tags: | type=ref,event=pr,suffix=-v2dl3-eventdisplay type=semver,pattern={{major}}.{{minor}}.{{patch}},suffix=-v2dl3-eventdisplay + type=schedule,pattern={{date 'YYYYMMDD'}} + type=raw,value={{date 'YYYYMMDD-HHmmss'}} images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} flavor: latest=true From 5d1de2db77015c845202be3531184ce0d9959e73 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Fri, 15 Mar 2024 17:56:24 +0100 Subject: [PATCH 3/5] naming --- .github/workflows/v2dl3-eventdisplay-packaging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/v2dl3-eventdisplay-packaging.yml b/.github/workflows/v2dl3-eventdisplay-packaging.yml index adcd824..043200b 100644 --- a/.github/workflows/v2dl3-eventdisplay-packaging.yml +++ b/.github/workflows/v2dl3-eventdisplay-packaging.yml @@ -58,7 +58,7 @@ jobs: type=semver,pattern={{major}}.{{minor}}.{{patch}},suffix=-v2dl3-eventdisplay type=schedule,pattern={{date 'YYYYMMDD'}} type=raw,value={{date 'YYYYMMDD-HHmmss'}} - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-v2dl3-eventdisplay flavor: latest=true - name: Build and push Docker image From e6b7d033154af9238d0201083135769d6dce9052 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Fri, 15 Mar 2024 18:00:16 +0100 Subject: [PATCH 4/5] naming --- .github/workflows/v2dl3-eventdisplay-packaging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/v2dl3-eventdisplay-packaging.yml b/.github/workflows/v2dl3-eventdisplay-packaging.yml index 043200b..adcd824 100644 --- a/.github/workflows/v2dl3-eventdisplay-packaging.yml +++ b/.github/workflows/v2dl3-eventdisplay-packaging.yml @@ -58,7 +58,7 @@ jobs: type=semver,pattern={{major}}.{{minor}}.{{patch}},suffix=-v2dl3-eventdisplay type=schedule,pattern={{date 'YYYYMMDD'}} type=raw,value={{date 'YYYYMMDD-HHmmss'}} - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-v2dl3-eventdisplay + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} flavor: latest=true - name: Build and push Docker image From ecce3ccf475322831dcb660f7a58e9c1c16c198e Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Fri, 15 Mar 2024 19:24:03 +0100 Subject: [PATCH 5/5] introduce workdir --- utils/v2dl3-eventdisplay-docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/v2dl3-eventdisplay-docker/Dockerfile b/utils/v2dl3-eventdisplay-docker/Dockerfile index 22b88ea..0e06ff2 100644 --- a/utils/v2dl3-eventdisplay-docker/Dockerfile +++ b/utils/v2dl3-eventdisplay-docker/Dockerfile @@ -1,5 +1,6 @@ # Dockerfile to build V2DL3 for Eventdisplay FROM mambaorg/micromamba:latest +WORKDIR /workdir/ RUN micromamba install -y -n base -c conda-forge git @@ -10,7 +11,7 @@ RUN eval "$(micromamba shell hook --shell bash)" && \ RUN cd V2DL3 && \ micromamba install -y -n base -f environment-eventdisplay.yml && \ micromamba clean --all --yes -ENV PYTHONPATH=$PYTHONPATH:"V2DL3/" +ENV PYTHONPATH="/workdir/V2DL3/" SHELL ["/bin/bash", "-c"]