From d2b291303b09cdaa7e3d43e425d28cc810687828 Mon Sep 17 00:00:00 2001 From: Stefan <42220813+Stefanuk12@users.noreply.github.com> Date: Mon, 10 Jul 2023 10:49:08 +0100 Subject: [PATCH] Revert to debian --- images/ptero-debian-surrealdb/Dockerfile | 10 ++--- images/ptero-debian-surrealdb/entrypoint.sh | 46 ++++----------------- 2 files changed, 13 insertions(+), 43 deletions(-) diff --git a/images/ptero-debian-surrealdb/Dockerfile b/images/ptero-debian-surrealdb/Dockerfile index 5b9875a..975a364 100644 --- a/images/ptero-debian-surrealdb/Dockerfile +++ b/images/ptero-debian-surrealdb/Dockerfile @@ -1,11 +1,11 @@ -FROM ghcr.io/parkervcp/yolks:alpine +FROM ghcr.io/parkervcp/yolks:debian LABEL author="Stefanuk12" maintainer="stefanukpadd@gmail.com" ## Install dependencies USER root -RUN apk update \ - && apk upgrade \ - && apk add curl gcompat +RUN apt update \ + && apt upgrade -y \ + && apt install curl -y ## Installing SurrealDB RUN curl -sSf https://install.surrealdb.com | sh @@ -15,4 +15,4 @@ USER container WORKDIR /home/container COPY ./entrypoint.sh /entrypoint.sh -CMD ["/bin/ash", "/entrypoint.sh"] \ No newline at end of file +CMD ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file diff --git a/images/ptero-debian-surrealdb/entrypoint.sh b/images/ptero-debian-surrealdb/entrypoint.sh index 5b3b0e2..8244bf9 100644 --- a/images/ptero-debian-surrealdb/entrypoint.sh +++ b/images/ptero-debian-surrealdb/entrypoint.sh @@ -1,43 +1,13 @@ -#!/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. -# +#!/bin/bash +cd /home/container -# Default the TZ environment variable to UTC. -TZ=${TZ:-UTC} -export TZ - -# Set environment variable that holds the Internal Docker IP +# Make internal Docker IP address available to processes. INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP -# Switch to the container's working directory -cd /home/container || exit 1 - -# 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 -)") +# Replace Startup Variables +MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') +echo -e ":/home/container$ ${MODIFIED_STARTUP}" -# 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} \ No newline at end of file +# Run the Server +eval ${MODIFIED_STARTUP} \ No newline at end of file