Merge pull request #46 from thelamer/master

Moving to python3
This commit is contained in:
Alex Kretzschmar 2019-03-01 23:53:39 -05:00 committed by GitHub
commit 2e7f7d9eff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 25 deletions

View file

@ -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 \

View file

@ -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 \

View file

@ -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 \

View file

@ -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.

View file

@ -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" }
- { date: "29.11.15:", desc: "Take out term setting, causing issues with key entry for some users" }