rebase to alpine 3.15, add nginx mime types

This commit is contained in:
thelamer 2021-11-29 13:40:35 -08:00
parent 5868ad79d4
commit 6d780dfaaf
7 changed files with 111 additions and 9 deletions

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:3.14 as binbuilder
FROM ghcr.io/linuxserver/baseimage-alpine:3.15 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.14 as nodebuilder
FROM ghcr.io/linuxserver/baseimage-alpine:3.15 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.14
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
# set version label
ARG BUILD_DATE

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14 as binbuilder
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 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.14 as nodebuilder
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 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.14
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
# set version label
ARG BUILD_DATE

View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14 as binbuilder
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 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.14 as nodebuilder
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 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.14
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
# set version label
ARG BUILD_DATE

View File

@ -242,6 +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.
* **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.

View File

@ -54,6 +54,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "29.11.21:", desc: "Add wasm mime type to NGINX, rebase to Alpine 3.15." }
- { 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." }

97
root/defaults/mime.types Normal file
View File

@ -0,0 +1,97 @@
types {
text/html html htm shtml;
text/css css;
text/xml xml;
image/gif gif;
image/jpeg jpeg jpg;
application/javascript js;
application/atom+xml atom;
application/rss+xml rss;
text/mathml mml;
text/plain txt;
text/vnd.sun.j2me.app-descriptor jad;
text/vnd.wap.wml wml;
text/x-component htc;
image/png png;
image/svg+xml svg svgz;
image/tiff tif tiff;
image/vnd.wap.wbmp wbmp;
image/webp webp;
image/x-icon ico;
image/x-jng jng;
image/x-ms-bmp bmp;
font/woff woff;
font/woff2 woff2;
application/java-archive jar war ear;
application/json json;
application/mac-binhex40 hqx;
application/msword doc;
application/pdf pdf;
application/postscript ps eps ai;
application/rtf rtf;
application/vnd.apple.mpegurl m3u8;
application/vnd.google-earth.kml+xml kml;
application/vnd.google-earth.kmz kmz;
application/vnd.ms-excel xls;
application/vnd.ms-fontobject eot;
application/vnd.ms-powerpoint ppt;
application/vnd.oasis.opendocument.graphics odg;
application/vnd.oasis.opendocument.presentation odp;
application/vnd.oasis.opendocument.spreadsheet ods;
application/vnd.oasis.opendocument.text odt;
application/vnd.openxmlformats-officedocument.presentationml.presentation
pptx;
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
xlsx;
application/vnd.openxmlformats-officedocument.wordprocessingml.document
docx;
application/vnd.wap.wmlc wmlc;
application/wasm wasm;
application/x-7z-compressed 7z;
application/x-cocoa cco;
application/x-java-archive-diff jardiff;
application/x-java-jnlp-file jnlp;
application/x-makeself run;
application/x-perl pl pm;
application/x-pilot prc pdb;
application/x-rar-compressed rar;
application/x-redhat-package-manager rpm;
application/x-sea sea;
application/x-shockwave-flash swf;
application/x-stuffit sit;
application/x-tcl tcl tk;
application/x-x509-ca-cert der pem crt;
application/x-xpinstall xpi;
application/xhtml+xml xhtml;
application/xspf+xml xspf;
application/zip zip;
application/octet-stream bin exe dll;
application/octet-stream deb;
application/octet-stream dmg;
application/octet-stream iso img;
application/octet-stream msi msp msm;
audio/midi mid midi kar;
audio/mpeg mp3;
audio/ogg ogg;
audio/x-m4a m4a;
audio/x-realaudio ra;
video/3gpp 3gpp 3gp;
video/mp2t ts;
video/mp4 mp4;
video/mpeg mpeg mpg;
video/quicktime mov;
video/webm webm;
video/x-flv flv;
video/x-m4v m4v;
video/x-mng mng;
video/x-ms-asf asx asf;
video/x-ms-wmv wmv;
video/x-msvideo avi;
}

View File

@ -14,3 +14,6 @@ fi
if [ ! -L '/emulatorjs/frontend/user' ]; then
ln -s /data /emulatorjs/frontend/user
fi
# nginx mime types
cp /defaults/mime.types /etc/nginx/mime.types