update alpine and workflow

gOOvER · Sep 25, 2023 · a4bbf90 · a4bbf90
1 parent 83b3dc8
commit a4bbf90
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 72 deletions.
diff --git a/.github/workflows/apps.yml b/.github/workflows/apps.yml
@@ -22,6 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         oses:
+          - discordpush
           - gitea
           - uptimekuma
 

diff --git a/.github/workflows/custom.yml b/.github/workflows/custom.yml
@@ -22,9 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         oses:
-          - discordpush
           - node16132
-          - 14pptr
 
     steps:
       - uses: actions/checkout@v4

diff --git a/alpine/nodejs18/Dockerfile b/alpine/nodejs18/Dockerfile
@@ -1,13 +1,13 @@
 FROM        --platform=$TARGETOS/$TARGETARCH node:18-alpine
 
-LABEL           author="Torsten Widmann" maintainer="info@goover.de"
-LABEL           org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
-LABEL           org.opencontainers.image.licenses=MIT
+LABEL       author="Torsten Widmann" maintainer="info@goover.de"
+LABEL       org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
+LABEL       org.opencontainers.image.licenses=MIT
 
-RUN             apk update \
-                && apk upgrade
+RUN         apk update \
+            && apk upgrade
 
-RUN         add --no-cache \
+RUN         apk add --no-cache \
                 autoconf \
                 automake \
                 build-essential \
@@ -32,13 +32,7 @@ RUN         add --no-cache \
 
 # updating npm 
 RUN         npm install npm@latest -g
-
-# add cloudflare repo
-RUN         mkdir -p --mode=0755 /usr/share/keyrings \
-                && curl -fsSL https://pkg.cloudflare.com/cloudflare-main.gpg | tee /usr/share/keyrings/cloudflare-main.gpg >/dev/null \
-                && echo 'deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared bookworm main' | tee /etc/apt/sources.list.d/cloudflared.list \
-                && apt update \ 
-                && apt install -y cloudflared
+RUN         npm install -g typescript ts-node
 
 ## Setup user and working directory
 RUN         useradd -m -d /home/container -s /bin/bash container

diff --git a/alpine/nodejs20/Dockerfile b/alpine/nodejs20/Dockerfile
@@ -1,13 +1,13 @@
 FROM        --platform=$TARGETOS/$TARGETARCH node:20-alpine
 
-LABEL           author="Torsten Widmann" maintainer="info@goover.de"
-LABEL           org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
-LABEL           org.opencontainers.image.licenses=MIT
+LABEL       author="Torsten Widmann" maintainer="info@goover.de"
+LABEL       org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
+LABEL       org.opencontainers.image.licenses=MIT
 
-RUN             apk update \
-                && apk upgrade
+RUN         apk update \
+            && apk upgrade
 
-RUN         add --no-cache \
+RUN         apk add --no-cache \
                 autoconf \
                 automake \
                 build-essential \
@@ -32,13 +32,7 @@ RUN         add --no-cache \
 
 # updating npm 
 RUN         npm install npm@latest -g
-
-# add cloudflare repo
-RUN         mkdir -p --mode=0755 /usr/share/keyrings \
-                && curl -fsSL https://pkg.cloudflare.com/cloudflare-main.gpg | tee /usr/share/keyrings/cloudflare-main.gpg >/dev/null \
-                && echo 'deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared bookworm main' | tee /etc/apt/sources.list.d/cloudflared.list \
-                && apt update \ 
-                && apt install -y cloudflared
+RUN         npm install -g typescript ts-node
 
 ## Setup user and working directory
 RUN         useradd -m -d /home/container -s /bin/bash container

diff --git a/custom/discordpush/Dockerfile → apps/discordpush/Dockerfile b/custom/discordpush/Dockerfile → apps/discordpush/Dockerfile
diff --git a/custom/14pptr/entrypoint.sh → apps/discordpush/entrypoint.sh b/custom/14pptr/entrypoint.sh → apps/discordpush/entrypoint.sh
diff --git a/custom/14pptr/Dockerfile b/custom/14pptr/Dockerfile
diff --git a/custom/discordpush/entrypoint.sh b/custom/discordpush/entrypoint.sh
diff --git a/dev/nodejs/16/Dockerfile b/dev/nodejs/16/Dockerfile
@@ -30,12 +30,7 @@ RUN         apt -y install \
 				libnss3 \
                 libsqlite3-dev
 
-# add cloudflare repo
-RUN         mkdir -p --mode=0755 /usr/share/keyrings \
-                && curl -fsSL https://pkg.cloudflare.com/cloudflare-main.gpg | tee /usr/share/keyrings/cloudflare-main.gpg >/dev/null \
-                && echo 'deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared bookworm main' | tee /etc/apt/sources.list.d/cloudflared.list \
-                && apt update \ 
-                && apt install -y cloudflared
+RUN         npm install -g typescript ts-node
 
 ## Setup user and working directory
 RUN         useradd -m -d /home/container -s /bin/bash container

diff --git a/dev/nodejs/18/Dockerfile b/dev/nodejs/18/Dockerfile
@@ -34,6 +34,7 @@ RUN         apt -y install \
 
 # updating npm 
 RUN         npm install npm@latest -g
+RUN         npm install -g typescript ts-node
 
 ## Setup user and working directory
 RUN         useradd -m -d /home/container -s /bin/bash container

diff --git a/dev/nodejs/20/Dockerfile b/dev/nodejs/20/Dockerfile
@@ -34,6 +34,7 @@ RUN         apt -y install \
 
 # updating npm 
 RUN         npm install npm@latest -g
+RUN         npm install -g typescript ts-node
 
 ## Setup user and working directory
 RUN         useradd -m -d /home/container -s /bin/bash container