graalvm fix

vega-network-main · Nov 16, 2024 · c27c7ed · c27c7ed
1 parent ce6e21f
commit c27c7ed
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 47 deletions.
diff --git a/Amazon Corretto/23-alpine/Dockerfile b/Amazon Corretto/23-alpine/Dockerfile
@@ -3,25 +3,25 @@
 # Environment: Java
 # Minimum Panel Version: 1.7.0
 # ----------------------------------
-    FROM --platform=$TARGETOS/$TARGETARCH amazoncorretto:23-alpine
+FROM --platform=$TARGETOS/$TARGETARCH amazoncorretto:23-alpine
 
-    LABEL authors="vovamod <[email protected]>,en0tuk <[email protected]>"
-    
-    ARG GITHUB_USER
-    ENV GITHUB_USER ${GITHUB_USER}
-    
-    ENV LANG='en_US.UTF-8' LANGUAGE='en_US:UTF-8' LC_ALL='en_US.UTF-8'
-    ENV DEBIAN_FRONTEND=noninteractive
-    
-    RUN apk update --no-cache \
-      && apk add bash curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2
-    
-    
-    RUN adduser -D -h /home/container container
-    USER        container
-    ENV         USER=container HOME=/home/container
-    WORKDIR     /home/container
-    
-    COPY        ./../entrypoint.sh /entrypoint.sh
-    CMD         ["/bin/bash", "/entrypoint.sh"]
+LABEL authors="vovamod <[email protected]>,en0tuk <[email protected]>"
+
+ARG GITHUB_USER
+ENV GITHUB_USER ${GITHUB_USER}
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:UTF-8' LC_ALL='en_US.UTF-8'
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apk update --no-cache \
+  && apk add bash curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2
+
+
+RUN adduser -D -h /home/container container
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         ["/bin/bash", "/entrypoint.sh"]
 
diff --git a/Amazon Corretto/23/Dockerfile b/Amazon Corretto/23/Dockerfile
@@ -3,25 +3,25 @@
 # Environment: Java
 # Minimum Panel Version: 1.7.0
 # ----------------------------------
-    FROM --platform=$TARGETOS/$TARGETARCH amazoncorretto:23
+FROM --platform=$TARGETOS/$TARGETARCH amazoncorretto:23
 
-    LABEL authors="vovamod <[email protected]>,en0tuk <[email protected]>"
-    
-    ARG GITHUB_USER
-    ENV GITHUB_USER ${GITHUB_USER}
-    
-    ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
-    ENV DEBIAN_FRONTEND=noninteractive
-    
-    RUN yum update -y \
-      && yum install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata locales iproute
-    
-    
-    RUN useradd -d /home/container -m container
-    USER        container
-    ENV         USER=container HOME=/home/container
-    WORKDIR     /home/container
-    
-    COPY        ./../entrypoint.sh /entrypoint.sh
-    CMD         ["/bin/bash", "/entrypoint.sh"]
+LABEL authors="vovamod <[email protected]>,en0tuk <[email protected]>"
+
+ARG GITHUB_USER
+ENV GITHUB_USER ${GITHUB_USER}
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN yum update -y \
+    && yum install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata locales iproute
+
+
+RUN useradd -d /home/container -m container
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         ["/bin/bash", "/entrypoint.sh"]
 
diff --git a/GraalVM/17/Dockerfile b/GraalVM/17/Dockerfile
@@ -6,7 +6,7 @@
 FROM ubuntu:22.04
 
 ARG TARGETPLATFORM
-ARG GRAAL_VERSION=17.0.9
+ARG GRAAL_VERSION=22.3.3
 
 LABEL authors="vovamod <[email protected]>,en0tuk <[email protected]>"
 
@@ -16,25 +16,28 @@ ENV GITHUB_USER ${GITHUB_USER}
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 ENV DEBIAN_FRONTEND=noninteractive
 
+# Install required packages and setup locale
 RUN apt-get update -y \
   && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata locales iproute2 \
   && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
   && locale-gen en_US.UTF-8 \
   && case ${TARGETPLATFORM} in \
-         "linux/amd64")  ARCH=x64  ;; \
-         "linux/arm64")  ARCH=aarch64  ;; \
+          "linux/amd64" | "linux/x86_64")  ARCH=amd64  ;; \
+          "linux/arm64")  ARCH=aarch64  ;; \
+          *) echo "Unknown platform" && exit 1 ;; \
     esac \
-  && curl --retry 3 -Lfso /tmp/graalvm.tar.gz https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${GRAAL_VERSION}/graalvm-community-jdk-{GRAAL_VERSION}_linux-${ARCH}_bin.tar.gz \
+  && curl --retry 3 -Lfso /tmp/graalvm.tar.gz "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${GRAAL_VERSION}/graalvm-ce-java17-linux-${ARCH}-${GRAAL_VERSION}.tar.gz" \
   && mkdir -p /opt/java/graalvm \
   && cd /opt/java/graalvm \
   && tar -xf /tmp/graalvm.tar.gz --strip-components=1 \
-  && export PATH="/opt/java/graalvm/bin:$PATH" \
   && rm -rf /var/lib/apt/lists/* \
   && rm -rf /tmp/graalvm.tar.gz
 
+# Set JAVA_HOME and update PATH
 ENV JAVA_HOME=/opt/java/graalvm \
     PATH="/opt/java/graalvm/bin:$PATH"
 
+# Add a user for running the application
 RUN useradd -d /home/container -m container
 
 USER        container
@@ -43,6 +46,9 @@ ENV         USER=container HOME=/home/container
 
 WORKDIR     /home/container
 
-COPY        ./../entrypoint.sh /entrypoint.sh
+# Copy the entrypoint script
+COPY        ./entrypoint.sh /entrypoint.sh
 
-CMD         ["/bin/bash", "/entrypoint.sh"]
+# Set entrypoint with sh (since bash may not be present)
+CMD         ["/bin/sh", "/entrypoint.sh"]
+