Merge pull request #5 from linuxserver/3.15

3.15
2026-03-09 00:03:36 +08:00 · 2021-12-23 09:55:16 -08:00 · 2021-12-23 09:55:16 -08:00 · e9c4eb88e3
commit e9c4eb88e3
parent 4061768aee ed8e5363af
10 changed files with 67 additions and 50 deletions
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@ -18,8 +18,8 @@ jobs:
          fi
          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_FIREFOX_MASTER\". ****"
          echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-            && awk '/^P:'"firefox-esr"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+            && awk '/^P:'"firefox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
            echo "**** Can't retrieve external version, exiting ****"
            FAILURE_REASON="Can't retrieve external version for firefox branch master"
--- a/28
+++ b/28
@ -8,20 +8,20 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"

 RUN \
- echo "**** install packages ****" && \
- apk add --no-cache --virtual=build-dependencies \
-	curl && \
- if [ -z ${FIREFOX_VERSION+x} ]; then \
-	FIREFOX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-	&& awk '/^P:firefox-esr$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
- fi && \
- apk add --no-cache \
-	firefox-esr==${FIREFOX_VERSION} && \
- echo "**** cleanup ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
-	/tmp/*
+  echo "**** install packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    curl && \
+  if [ -z ${FIREFOX_VERSION+x} ]; then \
+    FIREFOX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    && awk '/^P:firefox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+  fi && \
+  apk add --no-cache \
+    firefox==${FIREFOX_VERSION} && \
+  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
+    /tmp/*

 # add local files
 COPY /root /
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -8,20 +8,20 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"

 RUN \
- echo "**** install packages ****" && \
- apk add --no-cache --virtual=build-dependencies \
-	curl && \
- if [ -z ${FIREFOX_VERSION+x} ]; then \
-	FIREFOX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-	&& awk '/^P:firefox-esr$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
- fi && \
- apk add --no-cache \
-	firefox-esr==${FIREFOX_VERSION} && \
- echo "**** cleanup ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
-	/tmp/*
+  echo "**** install packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    curl && \
+  if [ -z ${FIREFOX_VERSION+x} ]; then \
+    FIREFOX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    && awk '/^P:firefox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+  fi && \
+  apk add --no-cache \
+    firefox==${FIREFOX_VERSION} && \
+  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
+    /tmp/*

 # add local files
 COPY /root /
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@ -8,20 +8,20 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"

 RUN \
- echo "**** install packages ****" && \
- apk add --no-cache --virtual=build-dependencies \
-	curl && \
- if [ -z ${FIREFOX_VERSION+x} ]; then \
-	FIREFOX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-	&& awk '/^P:firefox-esr$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
- fi && \
- apk add --no-cache \
-	firefox-esr==${FIREFOX_VERSION} && \
- echo "**** cleanup ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
-	/tmp/*
+  echo "**** install packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    curl && \
+  if [ -z ${FIREFOX_VERSION+x} ]; then \
+    FIREFOX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    && awk '/^P:firefox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+  fi && \
+  apk add --no-cache \
+    firefox==${FIREFOX_VERSION} && \
+  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
+    /tmp/*

 # add local files
 COPY /root /
--- a/6
+++ b/6
@ -25,9 +25,9 @@ pipeline {
    DEV_DOCKERHUB_IMAGE = 'lsiodev/firefox'
    PR_DOCKERHUB_IMAGE = 'lspipepr/firefox'
    DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.14'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/'
-    DIST_REPO_PACKAGES = 'firefox-esr'
+    DIST_TAG = '3.15'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/community/'
+    DIST_REPO_PACKAGES = 'firefox'
    MULTIARCH = 'true'
    CI = 'true'
    CI_WEB = 'true'
--- a/README.md
+++ b/README.md
@ -230,5 +230,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **23.12.21:** - Rebase to Alpine 3.15, stop using ESR.
 * **26.09.21:** - Rebase to Alpine 3.14.
 * **19.04.21:** - Initial release.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@ -15,9 +15,9 @@ repo_vars:
  - DEV_DOCKERHUB_IMAGE = 'lsiodev/firefox'
  - PR_DOCKERHUB_IMAGE = 'lspipepr/firefox'
  - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.14'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/'
-  - DIST_REPO_PACKAGES = 'firefox-esr'
+  - DIST_TAG = '3.15'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/community/'
+  - DIST_REPO_PACKAGES = 'firefox'
  - MULTIARCH = 'true'
  - CI = 'true'
  - CI_WEB = 'true'
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -45,5 +45,6 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "23.12.21:", desc: "Rebase to Alpine 3.15, stop using ESR." }
  - { date: "26.09.21:", desc: "Rebase to Alpine 3.14." }
  - { date: "19.04.21:", desc: "Initial release." }
--- a/root/defaults/menu.xml
+++ b/root/defaults/menu.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openbox_menu xmlns="http://openbox.org/3.4/menu">
+<menu id="root-menu" label="MENU">
+<item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/xterm</command></action></item>
+<item label="FireFox" icon="/usr/share/icons/hicolor/48x48/apps/firefox.png"><action name="Execute"><command>/usr/bin/firefox</command></action></item>
+<item label="Reload OB"><action name="Reconfigure"/></item>
+</menu>
+</openbox_menu>
--- a/root/etc/cont-init.d/56-openboxcopy
+++ b/root/etc/cont-init.d/56-openboxcopy
@ -0,0 +1,7 @@
+#!/usr/bin/with-contenv bash
+
+# default file copies first run
+[[ ! -f /config/.config/openbox/menu.xml ]] && \
+    mkdir -p /config/.config/openbox && \
+    cp /defaults/menu.xml /config/.config/openbox/menu.xml && \
+    chown -R abc:abc /config/.config