rebasing to alpine 3.9 moving to python3

This commit is contained in:
thelamer 2019-03-01 20:13:24 -08:00
parent 630d8752df
commit c94b975147
5 changed files with 30 additions and 28 deletions

View file

@ -1,4 +1,4 @@
FROM lsiobase/alpine:3.8 FROM lsiobase/alpine:3.9
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@ -9,7 +9,7 @@ LABEL maintainer="sparklyballs"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies --upgrade \
cmake \ cmake \
ffmpeg-dev \ ffmpeg-dev \
fftw-dev \ fftw-dev \
@ -21,9 +21,9 @@ RUN \
make \ make \
mpg123-dev \ mpg123-dev \
openjpeg-dev \ openjpeg-dev \
python2-dev && \ python3-dev && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache \ apk add --no-cache --upgrade \
curl \ curl \
expat \ expat \
ffmpeg \ ffmpeg \
@ -40,10 +40,10 @@ RUN \
mpg123 \ mpg123 \
nano \ nano \
openjpeg \ openjpeg \
py2-gobject3 \ py3-gobject3 \
py2-pip \ py3-pip \
py2-pylast \ py3-pylast \
python2 \ python3 \
sqlite-libs \ sqlite-libs \
tar \ tar \
wget && \ wget && \
@ -73,7 +73,7 @@ RUN \
BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json \ BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json \
|jq -r '. | .info.version'); \ |jq -r '. | .info.version'); \
fi && \ fi && \
pip install --no-cache-dir -U \ pip3 install --no-cache-dir -U \
beautifulsoup4 \ beautifulsoup4 \
beets==${BEETS_VERSION} \ beets==${BEETS_VERSION} \
beets-copyartifacts \ beets-copyartifacts \

View file

@ -1,4 +1,4 @@
FROM lsiobase/alpine.arm64:3.8 FROM lsiobase/alpine.arm64:3.9
# Add qemu to build on x86_64 systems # Add qemu to build on x86_64 systems
COPY qemu-aarch64-static /usr/bin COPY qemu-aarch64-static /usr/bin
@ -12,7 +12,7 @@ LABEL maintainer="sparklyballs"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies --upgrade \
cmake \ cmake \
ffmpeg-dev \ ffmpeg-dev \
fftw-dev \ fftw-dev \
@ -24,9 +24,9 @@ RUN \
make \ make \
mpg123-dev \ mpg123-dev \
openjpeg-dev \ openjpeg-dev \
python2-dev && \ python3-dev && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache \ apk add --no-cache --upgrade \
curl \ curl \
expat \ expat \
ffmpeg \ ffmpeg \
@ -43,10 +43,10 @@ RUN \
mpg123 \ mpg123 \
nano \ nano \
openjpeg \ openjpeg \
py2-gobject3 \ py3-gobject3 \
py2-pip \ py3-pip \
py2-pylast \ py3-pylast \
python2 \ python3 \
sqlite-libs \ sqlite-libs \
tar \ tar \
wget && \ wget && \
@ -76,7 +76,7 @@ RUN \
BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json \ BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json \
|jq -r '. | .info.version'); \ |jq -r '. | .info.version'); \
fi && \ fi && \
pip install --no-cache-dir -U \ pip3 install --no-cache-dir -U \
beautifulsoup4 \ beautifulsoup4 \
beets==${BEETS_VERSION} \ beets==${BEETS_VERSION} \
beets-copyartifacts \ beets-copyartifacts \

View file

@ -1,4 +1,4 @@
FROM lsiobase/alpine.armhf:3.8 FROM lsiobase/alpine.armhf:3.9
# Add qemu to build on x86_64 systems # Add qemu to build on x86_64 systems
COPY qemu-arm-static /usr/bin COPY qemu-arm-static /usr/bin
@ -12,7 +12,7 @@ LABEL maintainer="sparklyballs"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies --upgrade \
cmake \ cmake \
ffmpeg-dev \ ffmpeg-dev \
fftw-dev \ fftw-dev \
@ -24,9 +24,9 @@ RUN \
make \ make \
mpg123-dev \ mpg123-dev \
openjpeg-dev \ openjpeg-dev \
python2-dev && \ python3-dev && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache \ apk add --no-cache --upgrade \
curl \ curl \
expat \ expat \
ffmpeg \ ffmpeg \
@ -43,10 +43,10 @@ RUN \
mpg123 \ mpg123 \
nano \ nano \
openjpeg \ openjpeg \
py2-gobject3 \ py3-gobject3 \
py2-pip \ py3-pip \
py2-pylast \ py3-pylast \
python2 \ python3 \
sqlite-libs \ sqlite-libs \
tar \ tar \
wget && \ wget && \
@ -76,7 +76,7 @@ RUN \
BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json \ BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json \
|jq -r '. | .info.version'); \ |jq -r '. | .info.version'); \
fi && \ fi && \
pip install --no-cache-dir -U \ pip3 install --no-cache-dir -U \
beautifulsoup4 \ beautifulsoup4 \
beets==${BEETS_VERSION} \ beets==${BEETS_VERSION} \
beets-copyartifacts \ beets-copyartifacts \

View file

@ -159,6 +159,7 @@ Below are the instructions for updating containers:
## Versions ## Versions
* **01.03.19:** - Rebase to alpine 3.9, use python3.
* **07.02.19:** - Add fftw-dev build dependency for chromaprint. * **07.02.19:** - Add fftw-dev build dependency for chromaprint.
* **28.01.19:** - Add pipeline logic and multi arch. * **28.01.19:** - Add pipeline logic and multi arch.
* **15.08.18:** - Rebase to alpine 3.8, use alpine repo version of pylast. * **15.08.18:** - Rebase to alpine 3.8, use alpine repo version of pylast.

View file

@ -33,6 +33,7 @@ param_ports:
# changelog # changelog
changelogs: changelogs:
- { date: "01.03.19:", desc: "Rebase to alpine 3.9, use python3." }
- { date: "07.02.19:", desc: "Add fftw-dev build dependency for chromaprint." } - { date: "07.02.19:", desc: "Add fftw-dev build dependency for chromaprint." }
- { date: "28.01.19:", desc: "Add pipeline logic and multi arch." } - { 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." } - { 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: "10.09.16:", desc: "Add layer badges to README." }
- { date: "05.01.16:", desc: "Change ffpmeg repository, other version crashes container" } - { date: "05.01.16:", desc: "Change ffpmeg repository, other version crashes container" }
- { date: "06.11.15:", desc: "Initial Release" } - { date: "06.11.15:", desc: "Initial Release" }
- { date: "29.11.15:", desc: "Take out term setting, causing issues with key entry for some users" } - { date: "29.11.15:", desc: "Take out term setting, causing issues with key entry for some users" }