Skip to content
This repository was archived by the owner on Jun 9, 2025. It is now read-only.

Commit d987da7

Browse files
committed
revert rebase
1 parent 6d780df commit d987da7

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as binbuilder
1+
FROM ghcr.io/linuxserver/baseimage-alpine:3.14 as binbuilder
22

33
RUN \
44
echo "**** install build packages ****" && \
@@ -28,7 +28,7 @@ RUN \
2828
chmod +x /tmp/binmerge && \
2929
mv /tmp/binmerge /build-out/usr/local/bin
3030

31-
FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as nodebuilder
31+
FROM ghcr.io/linuxserver/baseimage-alpine:3.14 as nodebuilder
3232

3333
ARG EMULATORJS_RELEASE
3434
ARG RETRO_VERSION=1.9.10
@@ -84,7 +84,7 @@ RUN \
8484
npm install
8585

8686
# runtime stage
87-
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
87+
FROM ghcr.io/linuxserver/baseimage-alpine:3.14
8888

8989
# set version label
9090
ARG BUILD_DATE

Dockerfile.aarch64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 as binbuilder
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14 as binbuilder
22

33
RUN \
44
echo "**** install build packages ****" && \
@@ -28,7 +28,7 @@ RUN \
2828
chmod +x /tmp/binmerge && \
2929
mv /tmp/binmerge /build-out/usr/local/bin
3030

31-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 as nodebuilder
31+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14 as nodebuilder
3232

3333
ARG EMULATORJS_RELEASE
3434
ARG RETRO_VERSION=1.9.10
@@ -84,7 +84,7 @@ RUN \
8484
npm install
8585

8686
# runtime stage
87-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
87+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14
8888

8989
# set version label
9090
ARG BUILD_DATE

Dockerfile.armhf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 as binbuilder
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14 as binbuilder
22

33
RUN \
44
echo "**** install build packages ****" && \
@@ -28,7 +28,7 @@ RUN \
2828
chmod +x /tmp/binmerge && \
2929
mv /tmp/binmerge /build-out/usr/local/bin
3030

31-
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 as nodebuilder
31+
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14 as nodebuilder
3232

3333
ARG EMULATORJS_RELEASE
3434
ARG RETRO_VERSION=1.9.10
@@ -84,7 +84,7 @@ RUN \
8484
npm install
8585

8686
# runtime stage
87-
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
87+
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14
8888

8989
# set version label
9090
ARG BUILD_DATE

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
242242

243243
## Versions
244244

245-
* **29.11.21:** - Add wasm mime type to NGINX, rebase to Alpine 3.15.
245+
* **29.11.21:** - Add wasm mime type to NGINX
246246
* **26.11.21:** - Configure IPFS in a lower power mode, use homebuilt blobs for emu cores.
247247
* **19.11.21:** - Pin retroarch version.
248248
* **14.11.21:** - Update default cores to ingest.

readme-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ app_setup_block: |
5454
5555
# changelog
5656
changelogs:
57-
- { date: "29.11.21:", desc: "Add wasm mime type to NGINX, rebase to Alpine 3.15." }
57+
- { date: "29.11.21:", desc: "Add wasm mime type to NGINX" }
5858
- { date: "26.11.21:", desc: "Configure IPFS in a lower power mode, use homebuilt blobs for emu cores." }
5959
- { date: "19.11.21:", desc: "Pin retroarch version." }
6060
- { date: "14.11.21:", desc: "Update default cores to ingest." }

0 commit comments

Comments
 (0)