Add mono latest and libfreetype6 to java (pelican-eggs#18)

Changes codestyle of Java images
aussieserverhosts · Nov 12, 2021 · 5bbef80 · 5bbef80
1 parent 1788deb
commit 5bbef80
Show file tree

Hide file tree

Showing 11 changed files with 98 additions and 25 deletions.
diff --git a/.github/workflows/mono.yml b/.github/workflows/mono.yml
@@ -0,0 +1,38 @@
+name: build mono
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"
+  push:
+    branches:
+      - master
+    paths:
+      - mono/**
+jobs:
+  push:
+    name: "yolks:mono_${{ matrix.tag }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tag:
+          - latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: docker/setup-buildx-action@v1
+        with:
+          version: "v0.5.1"
+          buildkitd-flags: --debug
+      - uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - uses: docker/build-push-action@v2
+        with:
+          context: ./mono
+          file: ./mono/${{ matrix.tag }}/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ghcr.io/parkervcp/yolks:mono_${{ matrix.tag }}
diff --git a/README.md b/README.md
@@ -90,7 +90,10 @@ is tagged correctly.
   * [`java16`](/java/16)
     * `ghcr.io/parkervcp/yolks:java_16`
   * [`java17`](/java/17)
-    * `ghcr.io/parkervcp/yolks:java_17`    
+    * `ghcr.io/parkervcp/yolks:java_17`
+### [Mono](/mono)
+  * [`mono_latest`](/mono/latest)
+    * `ghcr.io/parkervcp/yolks:mono_latest`        
 ### [Nodejs](/nodejs)
   * [`node12`](/nodejs/12)
     * `ghcr.io/parkervcp/yolks:nodejs_12`
@@ -100,7 +103,7 @@ is tagged correctly.
     * `ghcr.io/parkervcp/yolks:nodejs_15`
   * [`node16`](/nodejs/16)
     * `ghcr.io/parkervcp/yolks:nodejs_16`
-  * [`node16`](/nodejs/17)
+  * [`node17`](/nodejs/17)
     * `ghcr.io/parkervcp/yolks:nodejs_17`    
 ### [Python](/python)
   * [`python3.7`](/python/3.7)
@@ -115,9 +118,7 @@ is tagged correctly.
   * [`TeaSpeak`](/teaspeak)
     * `ghcr.io/parkervcp/yolks:voice_teaspeak`    
 ### [Installation Images](/installers)
-
 * [`alpine-install`](/installers/alpine)
   * `ghcr.io/parkervcp/installers:alpine`
-
 * [`debian-install`](/installers/debian)
   * `ghcr.io/parkervcp/installers:debian`
diff --git a/java/11/Dockerfile b/java/11/Dockerfile
@@ -5,9 +5,9 @@ LABEL       author="Michael Parker" maintainer="[email protected]"
 LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 \
- 			&& useradd -d /home/container -m container
+RUN         apt update -y \
+						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container

diff --git a/java/11j9/Dockerfile b/java/11j9/Dockerfile
@@ -2,9 +2,9 @@ FROM        --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk11-openj9:debia
 
 LABEL       author="Michael Parker" maintainer="[email protected]"
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
- 			&& useradd -d /home/container -m container
+RUN         apt update -y \
+						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container

diff --git a/java/16/Dockerfile b/java/16/Dockerfile
@@ -5,9 +5,9 @@ LABEL       author="Michael Parker" maintainer="[email protected]"
 LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 \
- 			&& useradd -d /home/container -m container
+RUN         apt update -y \
+						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container

diff --git a/java/16j9/Dockerfile b/java/16j9/Dockerfile
@@ -2,9 +2,9 @@ FROM        --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk16-openj9:debia
 
 LABEL       author="Michael Parker" maintainer="[email protected]"
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
- 			&& useradd -d /home/container -m container
+RUN         apt update -y \
+						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container

diff --git a/java/17/Dockerfile b/java/17/Dockerfile
@@ -5,9 +5,9 @@ LABEL       author="Michael Parker" maintainer="[email protected]"
 LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 \
- 			&& useradd -d /home/container -m container
+RUN         apt update -y \
+						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container

diff --git a/java/8/Dockerfile b/java/8/Dockerfile
@@ -5,9 +5,9 @@ LABEL       author="Michael Parker" maintainer="[email protected]"
 LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 \
- 			&& useradd -d /home/container -m container
+RUN         apt update -y \
+						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container

diff --git a/java/8j9/Dockerfile b/java/8j9/Dockerfile
@@ -2,9 +2,9 @@ FROM        --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk8-openj9:debian
 
 LABEL       author="Michael Parker" maintainer="[email protected]"
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
- 			&& useradd -d /home/container -m container
+RUN         apt update -y \
+						&& apt install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libfreetype6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container

diff --git a/mono/entrypoint.sh b/mono/entrypoint.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+
+# Replace Startup Variables
+MODIFIED_STARTUP="eval $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')"
+echo ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+${MODIFIED_STARTUP}
diff --git a/mono/latest/Dockerfile b/mono/latest/Dockerfile
@@ -0,0 +1,22 @@
+# ----------------------------------
+# Mono Latest Image
+# Minimum Panel Version: 1.2.x
+# ----------------------------------
+FROM        ghcr.io/parkervcp/yolks:debian
+
+LABEL       author="Torsten Widmann" maintainer="[email protected]"
+
+RUN         apt update \
+            && apt -y upgrade
+RUN         apt install -y fontconfig dirmngr
+RUN         apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+RUN         sh -c 'echo "deb https://download.mono-project.com/repo/debian stable-buster main" > /etc/apt/sources.list.d/mono-official-stable.list'
+RUN         apt update
+RUN         apt install mono-complete -y
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./entrypoint.sh /entrypoint.sh
+CMD         ["/bin/bash", "/entrypoint.sh"]