From 35ce553ffee55630d976a11733bd5c9d610df0d2 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 08:12:16 +0800 Subject: [PATCH 01/15] Fixes & linting --- build_and_push.sh | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/build_and_push.sh b/build_and_push.sh index 9fb3b05..00c090d 100755 --- a/build_and_push.sh +++ b/build_and_push.sh @@ -1,20 +1,19 @@ -#!/bin/sh +#!/usr/bin/env sh +#shellcheck shell=sh -#VERSION=`picard -V | tr -s " " | cut -d " " -f 2 | tr -d ","` -#ARCH=`uname -m` -IMAGE=mikenye/picard +REPO=mikenye +IMAGE=picard # Build -docker image rm ${IMAGE}:builder +docker image rm ${REPO}/${IMAGE}:builder docker image rm jlesage/baseimage-gui:ubuntu-18.04 -docker build -f Dockerfile -t ${IMAGE}:builder . +docker build -f Dockerfile -t ${REPO}/${IMAGE}:builder . # Get version -VERSION=`docker run --rm --entrypoint picard mikenye/picard:builder -V | tail -1 | tr -s " " | cut -d " " -f 2 | tr -d ","` +VERSION=$(docker run --rm --entrypoint picard ${REPO}/${IMAGE}:builder -V | tail -1 | tr -s " " | cut -d " " -f 2 | tr -d ",") -docker tag ${IMAGE}:builder ${IMAGE}:${VERSION} -docker tag ${IMAGE}:builder ${IMAGE}:latest - -docker push ${IMAGE}:${VERSION} -docker push ${IMAGE}:latest +docker tag ${REPO}/${IMAGE}:builder ${REPO}/${IMAGE}:${VERSION} +docker tag ${REPO}/${IMAGE}:builder ${REPO}/${IMAGE}:latest +docker push ${REPO}/${IMAGE}:${VERSION} +docker push ${REPO}/${IMAGE}:latest From c0ce433bddf27a947ae3d6eec4426b7b01e86ce0 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 08:35:46 +0800 Subject: [PATCH 02/15] Add Firefox --- Dockerfile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index cef6319..7f54158 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,19 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 RUN set -x && \ - apt-get update -y && \ - echo "========== Japanese font support (github issue #2) ==========" && \ - apt-get install -y fonts-takao fonts-takao-mincho && \ - echo "=============================================================" && \ - apt-get install -y locales software-properties-common && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + firefox \ + fonts-takao \ + fonts-takao-mincho \ + locales \ + software-properties-common \ + && \ add-apt-repository -y ppa:musicbrainz-developers/stable && \ - apt-get install -y picard && \ + apt-get update && \ + apt-get install -y \ + picard \ + && \ echo "#!/bin/sh" >> /startapp.sh && \ echo "export HOME=/config" >> /startapp.sh && \ echo "/usr/bin/picard -N" >> /startapp.sh && \ @@ -23,4 +29,4 @@ ENV APP_NAME="MusicBrainz Picard" \ LC_ALL="en_US.UTF-8" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US.UTF-8" - + \ No newline at end of file From 2628c96c9e2d296f8f150f0c089373884774a1b2 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 09:39:56 +0800 Subject: [PATCH 03/15] Remove firefox, add chromium --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7f54158..2c48abd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 RUN set -x && \ apt-get update && \ apt-get install -y --no-install-recommends \ - firefox \ + chromium-browser \ fonts-takao \ fonts-takao-mincho \ locales \ From 99e0532469e4c3251136b305eb68e6f8701f17e6 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 09:49:21 +0800 Subject: [PATCH 04/15] Add BROWSER env --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 2c48abd..5ff9a2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,7 @@ RUN set -x && \ rm -rf /var/lib/apt/lists/* ENV APP_NAME="MusicBrainz Picard" \ + BROWSER="chromium-browser" LC_ALL="en_US.UTF-8" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US.UTF-8" From a2c5c1ec7ef1ca498ea28e70a523c9b11907f533 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 09:49:48 +0800 Subject: [PATCH 05/15] typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5ff9a2f..6caa125 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN set -x && \ rm -rf /var/lib/apt/lists/* ENV APP_NAME="MusicBrainz Picard" \ - BROWSER="chromium-browser" + BROWSER="chromium-browser" \ LC_ALL="en_US.UTF-8" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US.UTF-8" From 142cbeeddca89bd949c9f7ca5a419a21d084a4e7 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 10:37:28 +0800 Subject: [PATCH 06/15] Implement chromium-browser with no-sandbox --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 6caa125..d3c413a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,11 +4,14 @@ RUN set -x && \ apt-get update && \ apt-get install -y --no-install-recommends \ chromium-browser \ + desktop-file-utils \ fonts-takao \ fonts-takao-mincho \ locales \ software-properties-common \ && \ + sed 's/\/& --no-sandbox/' /usr/share/applications/chromium-browser.desktop > /usr/share/applications/chromium-browser-no-sandbox.desktop && \ + xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop && / add-apt-repository -y ppa:musicbrainz-developers/stable && \ apt-get update && \ apt-get install -y \ From 199d089324614745e53ee5002700bd27c3e2c9d3 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 10:38:06 +0800 Subject: [PATCH 07/15] typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d3c413a..c38ad5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN set -x && \ software-properties-common \ && \ sed 's/\/& --no-sandbox/' /usr/share/applications/chromium-browser.desktop > /usr/share/applications/chromium-browser-no-sandbox.desktop && \ - xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop && / + xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop && \ add-apt-repository -y ppa:musicbrainz-developers/stable && \ apt-get update && \ apt-get install -y \ From 4585b79794c10886b5189d904ff70679849783c2 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 10:41:18 +0800 Subject: [PATCH 08/15] Remove BROWSER env --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c38ad5a..9564995 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,6 @@ RUN set -x && \ rm -rf /var/lib/apt/lists/* ENV APP_NAME="MusicBrainz Picard" \ - BROWSER="chromium-browser" \ LC_ALL="en_US.UTF-8" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US.UTF-8" From 09d46db88073ffe6e3c00b173e919f00d42371c9 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 10:50:41 +0800 Subject: [PATCH 09/15] Add update-desktop-database --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9564995..41faca6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ RUN set -x && \ software-properties-common \ && \ sed 's/\/& --no-sandbox/' /usr/share/applications/chromium-browser.desktop > /usr/share/applications/chromium-browser-no-sandbox.desktop && \ + update-desktop-database -v && \ xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop && \ add-apt-repository -y ppa:musicbrainz-developers/stable && \ apt-get update && \ From f62e6b93ab74ee0f5f777036cfaca77ea40367dd Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 10:54:49 +0800 Subject: [PATCH 10/15] Fix missing dirs --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 41faca6..47dcdd6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,8 @@ RUN set -x && \ locales \ software-properties-common \ && \ + mkdir -p /config/xdg/config && \ + mkdir -p /usr/local/share/applications && \ sed 's/\/& --no-sandbox/' /usr/share/applications/chromium-browser.desktop > /usr/share/applications/chromium-browser-no-sandbox.desktop && \ update-desktop-database -v && \ xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop && \ From 0571bdbf08d95ea39c6e210a629d976fb869f0b1 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 11:00:10 +0800 Subject: [PATCH 11/15] Add xdg-settings set default-web-browser --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 47dcdd6..057b5e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,7 @@ RUN set -x && \ && \ echo "#!/bin/sh" >> /startapp.sh && \ echo "export HOME=/config" >> /startapp.sh && \ + echo "xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop" >> /startapp.sh && \ echo "/usr/bin/picard -N" >> /startapp.sh && \ chmod a+x /startapp.sh && \ locale-gen en_US.UTF-8 && \ From 17c4483ad078016892465c7ba3a9af35af64246e Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 11:09:43 +0800 Subject: [PATCH 12/15] More trying to get chromium to work --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 057b5e8..2531e90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,9 +12,9 @@ RUN set -x && \ && \ mkdir -p /config/xdg/config && \ mkdir -p /usr/local/share/applications && \ - sed 's/\/& --no-sandbox/' /usr/share/applications/chromium-browser.desktop > /usr/share/applications/chromium-browser-no-sandbox.desktop && \ update-desktop-database -v && \ - xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop && \ + #xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop && \ + update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/chromium-browser 200 && \ add-apt-repository -y ppa:musicbrainz-developers/stable && \ apt-get update && \ apt-get install -y \ @@ -22,7 +22,7 @@ RUN set -x && \ && \ echo "#!/bin/sh" >> /startapp.sh && \ echo "export HOME=/config" >> /startapp.sh && \ - echo "xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop" >> /startapp.sh && \ + #echo "xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop" >> /startapp.sh && \ echo "/usr/bin/picard -N" >> /startapp.sh && \ chmod a+x /startapp.sh && \ locale-gen en_US.UTF-8 && \ From 4e7177f8c98da97292c6301e377fae5b2f9d2889 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 11:14:33 +0800 Subject: [PATCH 13/15] xdg-settings set default-web-browser --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2531e90..20c1829 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN set -x && \ mkdir -p /config/xdg/config && \ mkdir -p /usr/local/share/applications && \ update-desktop-database -v && \ - #xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop && \ + xdg-settings set default-web-browser chromium-browser.desktop && \ update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/chromium-browser 200 && \ add-apt-repository -y ppa:musicbrainz-developers/stable && \ apt-get update && \ From 870d1170cf8cb33085a9c499ad3cdbd1796207f7 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 11:18:40 +0800 Subject: [PATCH 14/15] xdg-settings set default-web-browser --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 20c1829..f1f5556 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN set -x && \ mkdir -p /config/xdg/config && \ mkdir -p /usr/local/share/applications && \ update-desktop-database -v && \ - xdg-settings set default-web-browser chromium-browser.desktop && \ + #xdg-settings set default-web-browser chromium-browser.desktop && \ update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/chromium-browser 200 && \ add-apt-repository -y ppa:musicbrainz-developers/stable && \ apt-get update && \ @@ -22,7 +22,7 @@ RUN set -x && \ && \ echo "#!/bin/sh" >> /startapp.sh && \ echo "export HOME=/config" >> /startapp.sh && \ - #echo "xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop" >> /startapp.sh && \ + echo "xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop" >> /startapp.sh && \ echo "/usr/bin/picard -N" >> /startapp.sh && \ chmod a+x /startapp.sh && \ locale-gen en_US.UTF-8 && \ From fdc3ec5f5b3dc11b1f2e8360615964dc88444f68 Mon Sep 17 00:00:00 2001 From: Mike Nye Date: Tue, 14 Apr 2020 14:36:50 +0800 Subject: [PATCH 15/15] Implement firefox properly --- Dockerfile | 16 ++++------------ startapp.sh | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 12 deletions(-) create mode 100755 startapp.sh diff --git a/Dockerfile b/Dockerfile index f1f5556..1df4c2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,35 +3,27 @@ FROM jlesage/baseimage-gui:ubuntu-18.04 RUN set -x && \ apt-get update && \ apt-get install -y --no-install-recommends \ - chromium-browser \ - desktop-file-utils \ + firefox \ fonts-takao \ fonts-takao-mincho \ locales \ software-properties-common \ && \ - mkdir -p /config/xdg/config && \ - mkdir -p /usr/local/share/applications && \ - update-desktop-database -v && \ - #xdg-settings set default-web-browser chromium-browser.desktop && \ - update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/chromium-browser 200 && \ add-apt-repository -y ppa:musicbrainz-developers/stable && \ apt-get update && \ apt-get install -y \ picard \ && \ - echo "#!/bin/sh" >> /startapp.sh && \ - echo "export HOME=/config" >> /startapp.sh && \ - echo "xdg-settings set default-web-browser chromium-browser-no-sandbox.desktop" >> /startapp.sh && \ - echo "/usr/bin/picard -N" >> /startapp.sh && \ - chmod a+x /startapp.sh && \ locale-gen en_US.UTF-8 && \ mkdir -p /tmp/run/user/app && \ chmod 0700 /tmp/run/user/app && \ + update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/firefox 200 && \ echo "========== Clean-up ==========" && \ apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* +COPY startapp.sh /startapp.sh + ENV APP_NAME="MusicBrainz Picard" \ LC_ALL="en_US.UTF-8" \ LANG="en_US.UTF-8" \ diff --git a/startapp.sh b/startapp.sh new file mode 100755 index 0000000..3de5be4 --- /dev/null +++ b/startapp.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env sh +#shellcheck shell=sh + +set -xe + +export HOME=/config + +# Set default browser +#firefox -setDefaultBrowser +# +#PROFILEDIR=$(cat /config/.mozilla/firefox/profiles.ini | grep Path= | grep .default-release | cut -d "=" -f 2) +#PROFILEPATH="/config/.mozilla/firefox/${PROFILEDIR}" + +/usr/bin/picard -N \ No newline at end of file