From e4ecac2d4bb87b42b235c239219aa4b1554025b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Rom=C3=A1n?= <cesar@coatl.dev>
Date: Mon, 20 May 2024 12:54:02 -0700
Subject: [PATCH] chore(devcontainer): use coatldev/six:jython-3.12 as base
 image

---
 Dockerfile | 47 +++--------------------------------------------
 1 file changed, 3 insertions(+), 44 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e4187ec..556f377 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,50 +1,9 @@
-# hadolint global ignore=DL3008,DL3042
-FROM coatldev/six:3.12 as base
-
-ENV JYTHON_VERSION 2.7.3
-ENV JYTHON_HOME /opt/jython/${JYTHON_VERSION}
-
-RUN set -eux; \
-    \
-    apt-get update --quiet; \
-    apt-get install --yes --no-install-recommends \
-        openjdk-17-jre \
-    ; \
-    rm -rf /var/lib/apt/lists/*
-
-# >============================================================================<
-
-FROM base as jython
-
-RUN set -eux; \
-    \
-    apt-get update --quiet; \
-    apt-get install --yes --no-install-recommends \
-        wget \
-    ; \
-    rm -rf /var/lib/apt/lists/*
-
-WORKDIR /tmp
-
-RUN set -eux; \
-    \
-    wget -q "https://repo1.maven.org/maven2/org/python/jython-installer/${JYTHON_VERSION}/jython-installer-${JYTHON_VERSION}.jar"; \
-    \
-    java -jar "jython-installer-${JYTHON_VERSION}.jar" \
-        --silent \
-        --type standard \
-        --directory "$JYTHON_HOME"
-
-# >============================================================================<
-
-FROM base as final
-
-COPY --from=jython ${JYTHON_HOME}/ ${JYTHON_HOME}/
-
-ENV PATH ${JYTHON_HOME}/bin:$PATH
+FROM coatldev/six:jython-3.12 as devcontainer
 
 COPY requirements /tmp/requirements/
 
+# pip caching disabled by base image
+# hadolint ignore=DL3042
 RUN set -eux; \
     \
     python2 -m pip install --requirement \