From 2dbf7e9ee11d9318ed39170f6566e1ce4f66aab6 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Wed, 16 Jun 2021 17:53:38 -0400
Subject: [PATCH] standardize apt-get

---
 Dockerfile                         | 26 +++++++++++++-------------
 root/etc/cont-init.d/95-apt-get    |  3 +++
 root/etc/cont-init.d/98-powershell | 23 +++++++++++------------
 3 files changed, 27 insertions(+), 25 deletions(-)
 create mode 100644 root/etc/cont-init.d/95-apt-get

diff --git a/Dockerfile b/Dockerfile
index c30944e..9d5a050 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,30 +1,30 @@
-FROM lsiobase/alpine:3.11 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.13 as buildstage
 
 ARG PS_VERSION
 
 RUN \
- apk add --no-cache \
+  apk add --no-cache \
     curl \
     jq && \
- if [ -z ${PS_VERSION+x} ]; then \
-	PS_VERSION=$(curl -sX GET "https://api.github.com/repos/PowerShell/PowerShell/releases/latest" \
-	| jq -r .tag_name | awk '{print substr($1,2); }'); \
- fi && \
- mkdir -p /root-layer/powershell && \
- curl -o \
+  if [ -z ${PS_VERSION+x} ]; then \
+    PS_VERSION=$(curl -sX GET "https://api.github.com/repos/PowerShell/PowerShell/releases/latest" \
+      | jq -r .tag_name | awk '{print substr($1,2); }'); \
+  fi && \
+  mkdir -p /root-layer/powershell && \
+  curl -o \
     /root-layer/powershell/powershell_x86_64.tar.gz -L \
     "https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/powershell-${PS_VERSION}-linux-x64.tar.gz" && \
- curl -o \
+  curl -o \
     /root-layer/powershell/powershell_armv7l.tar.gz -L \
     "https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/powershell-${PS_VERSION}-linux-arm32.tar.gz" && \
- curl -o \
+  curl -o \
     /root-layer/powershell/powershell_aarch64.tar.gz -L \
     "https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/powershell-${PS_VERSION}-linux-arm64.tar.gz" && \
- echo "******** run basic test to validate tarballs *********" && \
- for i in x86_64 armv7l aarch64; do \
+  echo "******** run basic test to validate tarballs *********" && \
+  for i in x86_64 armv7l aarch64; do \
     mkdir -p "/tmp/${i}"; \
     tar xzf "/root-layer/powershell/powershell_${i}.tar.gz" -C "/tmp/${i}"; \
- done
+  done
 
 COPY root/ /root-layer/
 
diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get
new file mode 100644
index 0000000..3a725ea
--- /dev/null
+++ b/root/etc/cont-init.d/95-apt-get
@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+
+apt-get update
\ No newline at end of file
diff --git a/root/etc/cont-init.d/98-powershell b/root/etc/cont-init.d/98-powershell
index 210348b..73e271a 100644
--- a/root/etc/cont-init.d/98-powershell
+++ b/root/etc/cont-init.d/98-powershell
@@ -3,17 +3,16 @@
 ARCH=$(uname -m)
 
 if [ -f "/powershell/powershell_${ARCH}.tar.gz" ]; then
-  echo "Installing PowerShell"
-  apt-get update
-  apt-get install -y \
-    libicu60 \
-    libunwind8
-  tar xf "/powershell/powershell_${ARCH}.tar.gz" -C /powershell
-  rm -rf \
-    /powershell/powershell_x86_64.tar.gz \
-    /powershell/powershell_armv7l.tar.gz \
-    /powershell/powershell_aarch64.tar.gz
-  ln -s /powershell/pwsh /usr/bin/pwsh
+    echo "Installing PowerShell"
+    apt-get install -y \
+        libicu60 \
+        libunwind8
+    tar xf "/powershell/powershell_${ARCH}.tar.gz" -C /powershell
+    rm -rf \
+        /powershell/powershell_x86_64.tar.gz \
+        /powershell/powershell_armv7l.tar.gz \
+        /powershell/powershell_aarch64.tar.gz
+    ln -s /powershell/pwsh /usr/bin/pwsh
 else
-  echo "PowerShell already installed, skipping"
+    echo "PowerShell already installed, skipping"
 fi