Skip to content

Commit

Permalink
Reverting the upgraded docker setup.
Browse files Browse the repository at this point in the history
  • Loading branch information
haz committed Jun 21, 2022
1 parent b6b0730 commit fe70ed2
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 6 deletions.
36 changes: 31 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,37 @@
FROM ubuntu:22.04
# Stage 1: Build singularity
FROM golang:1.14 AS singularitybuilder

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
build-essential \
cryptsetup-bin \
git \
libgpgme-dev \
libseccomp-dev \
libssl-dev \
pkg-config \
squashfs-tools \
uuid-dev \
wget

ENV VERSION=3.5.2
RUN git clone https://github.com/sylabs/singularity.git
WORKDIR singularity
RUN git checkout v${VERSION}
RUN ./mconfig -p /usr/local/singularity
RUN make -C ./builddir
RUN make -C ./builddir install



# Stage 2: Build main container
FROM ubuntu:18.04

LABEL maintainer="Christian Muise ([email protected])"

COPY --from=singularitybuilder /usr/local/singularity /usr/local/singularity
RUN echo 'source /etc/bash_completion\nsource /usr/local/singularity/etc/bash_completion.d/singularity' >> ~/.bashrc
ENV PATH="/usr/local/singularity/bin:$PATH"

# Install required packages
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
Expand All @@ -22,10 +52,6 @@ RUN apt-get update \
python3-dev \
&& rm -rf /var/lib/apt/lists/*

RUN wget https://github.com/apptainer/apptainer/releases/download/v1.0.2/apptainer_1.0.2_amd64.deb \
&& dpkg -i apptainer_1.0.2_amd64.deb \
&& rm apptainer_1.0.2_amd64.deb

RUN pip3 install --upgrade pip
RUN pip3 install setuptools

Expand Down
39 changes: 39 additions & 0 deletions Dockerfile.experimental
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
FROM ubuntu:22.04

LABEL maintainer="Christian Muise ([email protected])"

# Install required packages
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
bash-completion \
ca-certificates \
git \
libseccomp-dev \
python3 \
python3-pip \
python3-venv \
squashfs-tools \
tzdata \
unzip \
vim \
wget \
build-essential \
gcc-x86-64-linux-gnu \
python3-dev \
&& rm -rf /var/lib/apt/lists/*

RUN wget https://github.com/apptainer/apptainer/releases/download/v1.0.2/apptainer_1.0.2_amd64.deb \
&& dpkg -i apptainer_1.0.2_amd64.deb \
&& rm apptainer_1.0.2_amd64.deb

RUN pip3 install --upgrade pip
RUN pip3 install setuptools

# Install & setup the planutils
RUN pip3 install planutils --trusted-host pypi.org --trusted-host files.pythonhosted.org
RUN planutils setup

WORKDIR /root

# default command to execute when container starts
CMD /bin/bash
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
long_description = fh.read()

setuptools.setup(name='planutils',
version='0.7.2',
version='0.7.3',
description='General library for setting up linux-based environments for developing, running, and evaluating planners.',
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down

0 comments on commit fe70ed2

Please sign in to comment.