revert rebase

linuxserver · Nov 29, 2021 · d987da7 · d987da7
1 parent 6d780df
commit d987da7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as binbuilder
+FROM ghcr.io/linuxserver/baseimage-alpine:3.14 as binbuilder
 
 RUN \
   echo "**** install build packages ****" && \
@@ -28,7 +28,7 @@ RUN \
   chmod +x /tmp/binmerge && \
   mv /tmp/binmerge /build-out/usr/local/bin
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as nodebuilder
+FROM ghcr.io/linuxserver/baseimage-alpine:3.14 as nodebuilder
 
 ARG EMULATORJS_RELEASE
 ARG RETRO_VERSION=1.9.10
@@ -84,7 +84,7 @@ RUN \
   npm install
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.14
 
 # set version label
 ARG BUILD_DATE

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 as binbuilder
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14 as binbuilder
 
 RUN \
   echo "**** install build packages ****" && \
@@ -28,7 +28,7 @@ RUN \
   chmod +x /tmp/binmerge && \
   mv /tmp/binmerge /build-out/usr/local/bin
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 as nodebuilder
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14 as nodebuilder
 
 ARG EMULATORJS_RELEASE
 ARG RETRO_VERSION=1.9.10
@@ -84,7 +84,7 @@ RUN \
   npm install
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14
 
 # set version label
 ARG BUILD_DATE

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 as binbuilder
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14 as binbuilder
 
 RUN \
   echo "**** install build packages ****" && \
@@ -28,7 +28,7 @@ RUN \
   chmod +x /tmp/binmerge && \
   mv /tmp/binmerge /build-out/usr/local/bin
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 as nodebuilder
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14 as nodebuilder
 
 ARG EMULATORJS_RELEASE
 ARG RETRO_VERSION=1.9.10
@@ -84,7 +84,7 @@ RUN \
   npm install
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14
 
 # set version label
 ARG BUILD_DATE

diff --git a/README.md b/README.md
@@ -242,7 +242,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **29.11.21:** - Add wasm mime type to NGINX, rebase to Alpine 3.15.
+* **29.11.21:** - Add wasm mime type to NGINX
 * **26.11.21:** - Configure IPFS in a lower power mode, use homebuilt blobs for emu cores.
 * **19.11.21:** - Pin retroarch version.
 * **14.11.21:** - Update default cores to ingest.

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -54,7 +54,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "29.11.21:", desc: "Add wasm mime type to NGINX, rebase to Alpine 3.15." }
+  - { date: "29.11.21:", desc: "Add wasm mime type to NGINX" }
   - { date: "26.11.21:", desc: "Configure IPFS in a lower power mode, use homebuilt blobs for emu cores." }
   - { date: "19.11.21:", desc: "Pin retroarch version." }
   - { date: "14.11.21:", desc: "Update default cores to ingest." }