Skip to content

Commit

Permalink
without checkout
Browse files Browse the repository at this point in the history
  • Loading branch information
timosachsenberg committed Mar 7, 2023
1 parent 1ab1389 commit 1240564
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ FROM ubuntu:22.04
# Step 1: set up a sane build system
USER root

COPY . /contrib

RUN apt-get -y update
RUN apt-get install -y --no-install-recommends --no-install-suggests g++ autoconf automake patch libtool make git gpg wget ca-certificates curl
RUN update-ca-certificates
Expand Down Expand Up @@ -31,7 +33,6 @@ RUN apt-get install -y --no-install-recommends --no-install-suggests qtbase5-dev

###################################
# Step 4: Compiled dependencies
RUN git clone https://github.com/OpenMS/contrib.git && rm -rf contrib/.git/
RUN mkdir contrib-build

WORKDIR /contrib-build
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/pyopenms/manylinux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

RUN yum install -y wget
RUN yum install -y xz qt5-qtbase-devel
Expand All @@ -22,7 +22,7 @@ RUN mkdir contrib-build
RUN ls -l
WORKDIR /contrib-build
RUN ls -l
RUN cmake -DBUILD_TYPE=ALL "../" && rm -rf archives src
RUN cmake -DBUILD_TYPE=ALL ../contrib && rm -rf archives src

WORKDIR /

Expand Down

0 comments on commit 1240564

Please sign in to comment.