diff --git a/Dockerfile b/Dockerfile index 2b29f9d..3d62d43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ LABEL maintainer="sparklyballs" RUN \ echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ + apk add --no-cache --virtual=build-dependencies --upgrade \ cmake \ ffmpeg-dev \ fftw-dev \ @@ -21,9 +21,9 @@ RUN \ make \ mpg123-dev \ openjpeg-dev \ - python2-dev && \ + python3-dev && \ echo "**** install runtime packages ****" && \ - apk add --no-cache \ + apk add --no-cache --upgrade \ curl \ expat \ ffmpeg \ @@ -40,10 +40,10 @@ RUN \ mpg123 \ nano \ openjpeg \ - py2-gobject3 \ - py2-pip \ - py2-pylast \ - python2 \ + py3-gobject3 \ + py3-pip \ + py3-pylast \ + python3 \ sqlite-libs \ tar \ wget && \ @@ -73,7 +73,7 @@ RUN \ BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json \ |jq -r '. | .info.version'); \ fi && \ - pip install --no-cache-dir -U \ + pip3 install --no-cache-dir -U \ beautifulsoup4 \ beets==${BEETS_VERSION} \ beets-copyartifacts \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 880bff0..dee6b17 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,7 +12,7 @@ LABEL maintainer="sparklyballs" RUN \ echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ + apk add --no-cache --virtual=build-dependencies --upgrade \ cmake \ ffmpeg-dev \ fftw-dev \ @@ -24,9 +24,9 @@ RUN \ make \ mpg123-dev \ openjpeg-dev \ - python2-dev && \ + python3-dev && \ echo "**** install runtime packages ****" && \ - apk add --no-cache \ + apk add --no-cache --upgrade \ curl \ expat \ ffmpeg \ @@ -43,10 +43,10 @@ RUN \ mpg123 \ nano \ openjpeg \ - py2-gobject3 \ - py2-pip \ - py2-pylast \ - python2 \ + py3-gobject3 \ + py3-pip \ + py3-pylast \ + python3 \ sqlite-libs \ tar \ wget && \ @@ -76,7 +76,7 @@ RUN \ BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json \ |jq -r '. | .info.version'); \ fi && \ - pip install --no-cache-dir -U \ + pip3 install --no-cache-dir -U \ beautifulsoup4 \ beets==${BEETS_VERSION} \ beets-copyartifacts \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 2fd73c8..6783fec 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -12,7 +12,7 @@ LABEL maintainer="sparklyballs" RUN \ echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ + apk add --no-cache --virtual=build-dependencies --upgrade \ cmake \ ffmpeg-dev \ fftw-dev \ @@ -24,9 +24,9 @@ RUN \ make \ mpg123-dev \ openjpeg-dev \ - python2-dev && \ + python3-dev && \ echo "**** install runtime packages ****" && \ - apk add --no-cache \ + apk add --no-cache --upgrade \ curl \ expat \ ffmpeg \ @@ -43,10 +43,10 @@ RUN \ mpg123 \ nano \ openjpeg \ - py2-gobject3 \ - py2-pip \ - py2-pylast \ - python2 \ + py3-gobject3 \ + py3-pip \ + py3-pylast \ + python3 \ sqlite-libs \ tar \ wget && \ @@ -76,7 +76,7 @@ RUN \ BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json \ |jq -r '. | .info.version'); \ fi && \ - pip install --no-cache-dir -U \ + pip3 install --no-cache-dir -U \ beautifulsoup4 \ beets==${BEETS_VERSION} \ beets-copyartifacts \ diff --git a/README.md b/README.md index a19efd3..6e601f3 100644 --- a/README.md +++ b/README.md @@ -159,6 +159,7 @@ Below are the instructions for updating containers: ## Versions +* **01.03.19:** - Switch to python3. * **07.02.19:** - Add fftw-dev build dependency for chromaprint. * **28.01.19:** - Add pipeline logic and multi arch. * **15.08.18:** - Rebase to alpine 3.8, use alpine repo version of pylast. diff --git a/readme-vars.yml b/readme-vars.yml index a3cfbdb..db9e350 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -33,6 +33,7 @@ param_ports: # changelog changelogs: + - { date: "01.03.19:", desc: "Switch to python3." } - { date: "07.02.19:", desc: "Add fftw-dev build dependency for chromaprint." } - { date: "28.01.19:", desc: "Add pipeline logic and multi arch." } - { date: "15.08.18:", desc: "Rebase to alpine 3.8, use alpine repo version of pylast." } @@ -53,4 +54,4 @@ changelogs: - { date: "10.09.16:", desc: "Add layer badges to README." } - { date: "05.01.16:", desc: "Change ffpmeg repository, other version crashes container" } - { date: "06.11.15:", desc: "Initial Release" } - - { date: "29.11.15:", desc: "Take out term setting, causing issues with key entry for some users" } \ No newline at end of file + - { date: "29.11.15:", desc: "Take out term setting, causing issues with key entry for some users" }