Update containers

container/Makefile

@@ -25,15 +25,19 @@ install:
 
 # Build a container that just has the morloc compiler
 build-tiny:
-	podman build -t ghcr.io/morloc-project/morloc/morloc-tiny:${MORLOC_VERSION} tiny
+	# podman build -t ghcr.io/morloc-project/morloc/morloc-tiny:${MORLOC_VERSION} tiny
+	podman build --no-cache --force-rm -t ghcr.io/morloc-project/morloc/morloc-tiny:${MORLOC_VERSION} tiny
 
 # Build the required docker image
 build-full:
-	podman build -t ghcr.io/morloc-project/morloc/morloc-full:${MORLOC_VERSION} full
+	podman build --no-cache --force-rm -t ghcr.io/morloc-project/morloc/morloc-full:${MORLOC_VERSION} full
 
 # Open a shell with a nice environment (vim and other niceties)
 shell:
-	podman run -w "/home/morloc" -it morloc-full /bin/sh
+	podman run --rm -it ghcr.io/morloc-project/morloc/morloc-full:${MORLOC_VERSION} /bin/bash
+
+shell-tiny:
+	podman run --rm -it ghcr.io/morloc-project/morloc/morloc-tiny:${MORLOC_VERSION} /bin/bash
 
 # push local containers to the github registry
 push:

container/full/Dockerfile

@@ -3,7 +3,7 @@ LABEL org.opencontainers.image.description="A morloc container intended for inte
 LABEL org.opencontainers.image.licenses=MIT
 
 FROM ubuntu:22.04
-COPY --from=ghcr.io/morloc-project/morloc/morloc-tiny:0.50.0 /bin/morloc /bin/morloc
+COPY --from=ghcr.io/morloc-project/morloc/morloc-tiny:0.51.0 /bin/morloc /bin/morloc
 
 
 WORKDIR $HOME
@@ -13,7 +13,9 @@ RUN apt-get update
 # Set the timezone, this avoids hanging later on
 RUN DEBIAN_FRONTEND=noninteractive TZ=Antarctica/Troll apt-get -y install tzdata
 
-RUN apt-get install -y r-base python3.10 libgsl-dev git
+RUN apt-get install -y r-base python3.10 libgsl-dev git pip
+RUN python3 -m pip install --upgrade pip setuptools
+
 
 # Set up R environment
 RUN Rscript -e 'install.packages(c("rlang", "future"), repos  = "https://cloud.r-project.org")'