Shifting back after identifying issue #87

Dockerfile

@@ -1,37 +1,7 @@
-# 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
+FROM ubuntu:22.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 \
@@ -47,8 +17,15 @@ RUN apt-get update \
         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
 

setup.py

@@ -8,7 +8,7 @@
     long_description = fh.read()
 
 setuptools.setup(name='planutils',
-      version='0.7.4',
+      version='0.7.5',
       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",