Make cassandra to a generic yolks image

.github/workflows/cassandra.yml

@@ -1,4 +1,4 @@
-name: build software
+name: build cassandra
 on:
   schedule:
     - cron: "0 0 * * 1"
@@ -6,18 +6,17 @@ on:
     branches:
       - master
     paths:
-      - 'software/**'
+      - cassandra/**
-
 jobs:
-  cassandra:
+  push:
-    name: "software:${{ matrix.cassandra }}"
+    name: "yolks:cassandra_${{ matrix.tag }}"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        cassandra:
+        tag:
-          - cassandra_java11_python2
+          - java8_python2
-          - cassandra_java11_python3
+          - java11_python3
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-buildx-action@v1
@@ -31,11 +30,9 @@ jobs:
           password: ${{ secrets.REGISTRY_TOKEN }}
       - uses: docker/build-push-action@v2
         with:
-          context: ./software/cassandra/${{ matrix.cassandra }}
+          context: ./cassandra
-          file: ./software/cassandra/${{ matrix.cassandra }}/Dockerfile
+          file: ./cassandra/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64
           push: true
           tags: |
-             ghcr.io/parkervcp/software:${{ matrix.cassandra }}
+            ghcr.io/parkervcp/yolks:cassandra_${{ matrix.tag }}
-
-# Copy a job above and adjust it to enable the build of newly added software

cassandra/entrypoint.sh

@@ -0,0 +1,33 @@
+#!/bin/ash
+
+# Default the TZ environment variable to UTC.
+TZ=${TZ:-UTC}
+export TZ
+
+# Set environment variable that holds the Internal Docker IP
+INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
+export INTERNAL_IP
+
+# Switch to the container's working directory
+cd /home/container || exit 1
+
+# Print Python version
+if command -v python &> /dev/null
+then
+	printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mpython --version\n"
+	python --version
+else
+	printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mpython3 --version\n"
+	python3 --version
+fi
+
+# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
+# variable format of "${VARIABLE}" before evaluating the string and automatically
+# replacing the values.
+PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)")
+
+# Display the command we're running in the output, and then execute it with the env
+# from the container itself.
+printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED"
+# shellcheck disable=SC2086
+exec env ${PARSED}

software/cassandra/entrypoint.sh

@@ -1,55 +0,0 @@
-#!/bin/ash
-
-#
-# Copyright (c) 2021 Matthew Penner
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-
-# Default the TZ environment variable to UTC.
-TZ=${TZ:-UTC}
-export TZ
-
-# Set environment variable that holds the Internal Docker IP
-INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
-export INTERNAL_IP
-
-# Switch to the container's working directory
-cd /home/container || exit 1
-
-# Print Python version
-if command -v python &> /dev/null
-then
-	printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mpython --version\n"
-	python --version
-else
-	printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mpython3 --version\n"
-	python3 --version
-fi
-
-# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
-# variable format of "${VARIABLE}" before evaluating the string and automatically
-# replacing the values.
-PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)")
-
-# Display the command we're running in the output, and then execute it with the env
-# from the container itself.
-printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED"
-# shellcheck disable=SC2086
-exec env ${PARSED}