Merge pull request #54 from thelamer/master

move to python3

Dockerfile

@@ -12,12 +12,12 @@ RUN \
  apt-get update && \
  apt-get install -y \
 	git \
-	python-pip && \
+	python3-pip && \
  echo "**** install runtime packages ****" && \
  apt-get install -y \
 	imagemagick \
 	libxcomposite1 \
-	python-minimal \
+	python3-minimal \
 	unrar && \
  echo "**** install calibre-web ****" && \
  if [ -z ${CALIBREWEB_RELEASE+x} ]; then \
@@ -33,14 +33,14 @@ RUN \
  /tmp/calibre-web.tar.gz -C \
 	/app/calibre-web --strip-components=1 && \
  cd /app/calibre-web && \
- pip install --no-cache-dir -U -r \
+ pip3 install --no-cache-dir -U -r \
 	requirements.txt && \
- pip install --no-cache-dir -U -r \
+ pip3 install --no-cache-dir -U -r \
 	optional-requirements.txt && \
  echo "**** cleanup ****" && \
  apt-get -y purge \
 	git \
-	python-pip && \
+	python3-pip && \
  apt-get -y autoremove && \
  rm -rf \
 	/tmp/* \

Dockerfile.aarch64

@@ -18,13 +18,13 @@ RUN \
 	libjpeg-dev \
 	libxml2-dev \
 	libxslt1-dev \
-	python-pip \
+	python3-pip \
 	zlib1g-dev && \
  echo "**** install runtime packages ****" && \
  apt-get install -y \
 	imagemagick \
 	libxcomposite1 \
-	python-minimal \
+	python3-minimal \
 	unrar && \
  echo "**** install calibre-web ****" && \
  if [ -z ${CALIBREWEB_RELEASE+x} ]; then \
@@ -40,9 +40,9 @@ RUN \
  /tmp/calibre-web.tar.gz -C \
 	/app/calibre-web --strip-components=1 && \
  cd /app/calibre-web && \
- pip install --no-cache-dir -U -r \
+ pip3 install --no-cache-dir -U -r \
 	requirements.txt && \
- pip install --no-cache-dir -U -r \
+ pip3 install --no-cache-dir -U -r \
 	optional-requirements.txt && \
  echo "**** cleanup ****" && \
  apt-get -y purge \
@@ -53,7 +53,7 @@ RUN \
 	libjpeg-dev \
 	libxml2-dev \
 	libxslt1-dev \
-	python-pip \
+	python3-pip \
 	zlib1g-dev && \
  apt-get -y autoremove && \
  rm -rf \

Dockerfile.armhf

@@ -18,13 +18,13 @@ RUN \
 	libjpeg-dev \
 	libxml2-dev \
 	libxslt1-dev \
-	python-pip \
+	python3-pip \
 	zlib1g-dev && \
  echo "**** install runtime packages ****" && \
  apt-get install -y \
 	imagemagick \
 	libxcomposite1 \
-	python-minimal \
+	python3-minimal \
 	unrar && \
  echo "**** install calibre-web ****" && \
  if [ -z ${CALIBREWEB_RELEASE+x} ]; then \
@@ -40,9 +40,9 @@ RUN \
  /tmp/calibre-web.tar.gz -C \
 	/app/calibre-web --strip-components=1 && \
  cd /app/calibre-web && \
- pip install --no-cache-dir -U -r \
+ pip3 install --no-cache-dir -U -r \
 	requirements.txt && \
- pip install --no-cache-dir -U -r \
+ pip3 install --no-cache-dir -U -r \
 	optional-requirements.txt && \
  echo "**** cleanup ****" && \
  apt-get -y purge \
@@ -53,7 +53,7 @@ RUN \
 	libjpeg-dev \
 	libxml2-dev \
 	libxslt1-dev \
-	python-pip \
+	python3-pip \
 	zlib1g-dev && \
  apt-get -y autoremove && \
  rm -rf \

README.md

@@ -222,6 +222,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **10.13.19:** - Migrate to Python3.
 * **01.08.19:** - Add libxcomposite1.
 * **13.06.19:** - Add docker mod to enable optional ebook conversion on x86-64.  Add unrar.
 * **02.06.19:** - Rebase to Ubuntu Bionic & add Gdrive support.

readme-vars.yml

@@ -70,6 +70,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "10.13.19:", desc: "Migrate to Python3." }
   - { date: "01.08.19:", desc: "Add libxcomposite1." }
   - { date: "13.06.19:", desc: "Add docker mod to enable optional ebook conversion on x86-64.  Add unrar." }
   - { date: "02.06.19:", desc: "Rebase to Ubuntu Bionic & add Gdrive support." }

root/etc/services.d/calibre-web/run

@@ -3,4 +3,4 @@
 cd /app/calibre-web || exit
 
 exec \
-	s6-setuidgid abc python /app/calibre-web/cps.py
+	s6-setuidgid abc python3 /app/calibre-web/cps.py