From 1ab1389d357fac48d0e3fec427a7f973f609b239 Mon Sep 17 00:00:00 2001 From: Timo Sachsenberg Date: Tue, 7 Mar 2023 14:55:28 +0100 Subject: [PATCH] Timosachsenberg patch 2 (#133) * Update deploy-manylinux-docker.yml * Update Dockerfile --- .github/workflows/deploy-manylinux-docker.yml | 1 + dockerfiles/pyopenms/manylinux/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-manylinux-docker.yml b/.github/workflows/deploy-manylinux-docker.yml index 5950184..7eca083 100644 --- a/.github/workflows/deploy-manylinux-docker.yml +++ b/.github/workflows/deploy-manylinux-docker.yml @@ -45,6 +45,7 @@ jobs: with: push: true # Will only build if this is not here file: dockerfiles/pyopenms/manylinux/Dockerfile + context: . build-args: | OPENMS_BRANCH=${{ steps.extract_branch.outputs.branch }} OPENMS_VERSION=${{ steps.tag_name.outputs.tag }} diff --git a/dockerfiles/pyopenms/manylinux/Dockerfile b/dockerfiles/pyopenms/manylinux/Dockerfile index 1b4a961..1aa937e 100644 --- a/dockerfiles/pyopenms/manylinux/Dockerfile +++ b/dockerfiles/pyopenms/manylinux/Dockerfile @@ -5,7 +5,7 @@ ARG OPENMS_BRANCH="master" ARG OPENMS_VERSION="latest" # make source files from context available in docker -COPY ./contrib/ ./contrib/ +COPY contrib /contrib RUN yum install -y wget RUN yum install -y xz qt5-qtbase-devel @@ -17,7 +17,7 @@ RUN yum install -y cmake3 RUN ln -s /usr/bin/cmake3 /usr/bin/cmake # builds contrib for the current checked out branch -# during cleanup: removes all source folders and only keeps contrib-build +# during cleanup: removes archives RUN mkdir contrib-build RUN ls -l WORKDIR /contrib-build