From df466495f571dc23dbeaab20a5a325995f916615 Mon Sep 17 00:00:00 2001 From: meanmail Date: Sun, 24 Sep 2023 23:15:14 +0400 Subject: [PATCH 1/6] Reformat epicbox-debian --- epicbox-debian/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epicbox-debian/Dockerfile b/epicbox-debian/Dockerfile index 9fbdb5a..7a0f2ec 100644 --- a/epicbox-debian/Dockerfile +++ b/epicbox-debian/Dockerfile @@ -3,7 +3,8 @@ FROM bitnami/minideb:bullseye RUN install_packages \ curl \ locales \ - && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen + && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ + && locale-gen ENV LANG en_US.UTF-8 From 39128cf6e1ea13141d95bafeebacccd353ac06dc Mon Sep 17 00:00:00 2001 From: meanmail Date: Mon, 25 Sep 2023 16:36:47 +0400 Subject: [PATCH 2/6] Revert "Remove unused 2" This reverts commit ea2cad59afbd8ad8d04326750dc6d20c5c438ade. --- .github/workflows/ci.yml | 13 +++++++++++++ epicbox-scala/2/Dockerfile | 15 +++++++++++++++ epicbox-scala/2/java_lookup_main.sh | 15 +++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 epicbox-scala/2/Dockerfile create mode 100644 epicbox-scala/2/java_lookup_main.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33213d0..5b584f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -313,6 +313,19 @@ jobs: image_name_tag: ruby:2.5.3 username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} + build_scala2_image: + name: Build epicbox/scala2 image + runs-on: [self-hosted, small] + steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: Build + uses: ./.github/workflows/actions/build + with: + path: epicbox-scala/2 + image_name_tag: scala:2.12.7 + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_PASSWORD }} build_scala3_image: name: Build epicbox/scala3 image runs-on: [self-hosted, small] diff --git a/epicbox-scala/2/Dockerfile b/epicbox-scala/2/Dockerfile new file mode 100644 index 0000000..a2c7f24 --- /dev/null +++ b/epicbox-scala/2/Dockerfile @@ -0,0 +1,15 @@ +FROM openjdk:8u181-slim + +ENV SCALA_VERSION 2.12.7 +ENV PATH /opt/scala-$SCALA_VERSION/bin:$PATH + +RUN apt-get update && \ + apt-get install -y --no-install-recommends wget && \ + rm -rf /var/lib/apt/lists/* && \ + touch /usr/lib/jvm/java-8-openjdk-amd64/release && \ + wget -O - https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /opt + +COPY java_lookup_main.sh /usr/local/bin/java_lookup_main.sh +RUN chmod +x /usr/local/bin/java_lookup_main.sh + +RUN useradd -M -d /sandbox sandbox diff --git a/epicbox-scala/2/java_lookup_main.sh b/epicbox-scala/2/java_lookup_main.sh new file mode 100644 index 0000000..b411051 --- /dev/null +++ b/epicbox-scala/2/java_lookup_main.sh @@ -0,0 +1,15 @@ +#!/bin/bash +# Grep *.class files in the given directory to find one with psvm method defined +# Usage: java_lookup_main.sh DIRECTORY_PATH + +PSVM_REGEX="public static( final)? void main\(java\.lang\.String(\[\]|\.\.\.)\)" + +shopt -s nullglob +for f in "$1"/*.class; do + if javap -p "$f" 2> /dev/null | grep -Pq "$PSVM_REGEX"; then + filename=$(basename "$f") + echo -n "${filename%.*}" + exit 0 + fi +done +exit 1 From 4777553cc0d52d3eb077572e97a7c19ce3431cb8 Mon Sep 17 00:00:00 2001 From: meanmail Date: Mon, 25 Sep 2023 16:59:49 +0400 Subject: [PATCH 3/6] Update Dockerfile --- epicbox-scala/2/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epicbox-scala/2/Dockerfile b/epicbox-scala/2/Dockerfile index a2c7f24..950677c 100644 --- a/epicbox-scala/2/Dockerfile +++ b/epicbox-scala/2/Dockerfile @@ -1,13 +1,13 @@ FROM openjdk:8u181-slim -ENV SCALA_VERSION 2.12.7 +ENV SCALA_VERSION 2.13.12 ENV PATH /opt/scala-$SCALA_VERSION/bin:$PATH RUN apt-get update && \ apt-get install -y --no-install-recommends wget && \ rm -rf /var/lib/apt/lists/* && \ touch /usr/lib/jvm/java-8-openjdk-amd64/release && \ - wget -O - https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /opt + wget -O - https://downloads.lightbend.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /opt COPY java_lookup_main.sh /usr/local/bin/java_lookup_main.sh RUN chmod +x /usr/local/bin/java_lookup_main.sh From 28376a62c52e312d57dabcab23515d929e0309ae Mon Sep 17 00:00:00 2001 From: meanmail Date: Mon, 25 Sep 2023 17:20:45 +0400 Subject: [PATCH 4/6] Update Dockerfile --- epicbox-scala/2/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epicbox-scala/2/Dockerfile b/epicbox-scala/2/Dockerfile index 950677c..0fc518f 100644 --- a/epicbox-scala/2/Dockerfile +++ b/epicbox-scala/2/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8u181-slim +FROM openjdk:8u342-slim ENV SCALA_VERSION 2.13.12 ENV PATH /opt/scala-$SCALA_VERSION/bin:$PATH From 108abd6c6b55cc07a9c0b7112aff2cfebd88446a Mon Sep 17 00:00:00 2001 From: meanmail Date: Mon, 25 Sep 2023 17:38:24 +0400 Subject: [PATCH 5/6] Debug --- epicbox-scala/2/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/epicbox-scala/2/Dockerfile b/epicbox-scala/2/Dockerfile index 0fc518f..ed951dc 100644 --- a/epicbox-scala/2/Dockerfile +++ b/epicbox-scala/2/Dockerfile @@ -6,6 +6,7 @@ ENV PATH /opt/scala-$SCALA_VERSION/bin:$PATH RUN apt-get update && \ apt-get install -y --no-install-recommends wget && \ rm -rf /var/lib/apt/lists/* && \ + ls /usr/lib/jvm/ &&\ touch /usr/lib/jvm/java-8-openjdk-amd64/release && \ wget -O - https://downloads.lightbend.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /opt From a5b146a9b3b6d134caa4a0d79f28b57f710a138b Mon Sep 17 00:00:00 2001 From: meanmail Date: Mon, 25 Sep 2023 18:18:58 +0400 Subject: [PATCH 6/6] Fix --- epicbox-scala/2/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epicbox-scala/2/Dockerfile b/epicbox-scala/2/Dockerfile index ed951dc..3c1214d 100644 --- a/epicbox-scala/2/Dockerfile +++ b/epicbox-scala/2/Dockerfile @@ -6,8 +6,7 @@ ENV PATH /opt/scala-$SCALA_VERSION/bin:$PATH RUN apt-get update && \ apt-get install -y --no-install-recommends wget && \ rm -rf /var/lib/apt/lists/* && \ - ls /usr/lib/jvm/ &&\ - touch /usr/lib/jvm/java-8-openjdk-amd64/release && \ + touch /usr/local/openjdk-8/release && \ wget -O - https://downloads.lightbend.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /opt COPY java_lookup_main.sh /usr/local/bin/java_lookup_main.sh