Skip to content

Commit

Permalink
* added missing dependency **libxcomposite** which is needed for PDF…
Browse files Browse the repository at this point in the history
… related conversions via `ebook-convert`

 * updated Libraries - Calibre converter ebook-convert (calibre 3.30.0) => (calibre 3.31.0)
  • Loading branch information
Technosoft2000 committed Sep 9, 2018
1 parent 7af0aeb commit 6e8e2fc
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 32 deletions.
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
**2018-09-09 - v1.2.3**
* added missing dependency **libxcomposite** which is needed for PDF related conversions via `ebook-convert`
* Updated Libraries
- Calibre converter ebook-convert (calibre 3.30.0) => (calibre 3.31.0)

| **Program library** | **Installed Version** |
| ------------------- | --------------------- |
| Sqlite | v3.24.0 |
| lxml | v4.2.4.0 |
| Image Magick | ImageMagick 6.9.10-10 Q16 x86_64 2018-08-15 https://www.imagemagick.org |
| kindlegen | Amazon kindlegen(Linux) V2.9 build 1028-0897292 |
| Flask | v1.0.2 |
| Babel | v2.6.0 |
| PyPdf | v1.26.0 |
| pySqlite | v2.6.0 |
| Python | 2.7.15 (default, May 10 2018, 21:00:22) [GCC 6.4.0] |
| Sqlalchemy | v1.2.11 |
| Iso 639 | v0.4.5 |
| Calibre converter | ebook-convert (calibre 3.31.0) |
| Requests | v2.19.1 |
| Gevent | v1.3.6 |
| Flask Login | v0.4.1 |
| Flask Principal | v0.4.0 |

* `ebook-convert` supports the following target formats:
**EPUB, AZW3, MOBI, DOCX, FB2, HTMLZ, LIT, LRF, PDB, PDF, PMLZ, RB, RTF, SNB, TCR, TXT, TXTZ, ZIP**
see also at https://manual.calibre-ebook.com/generated/en/ebook-convert.html

**2018-08-28 - v1.2.2**

* glibc locale are generated now for the following definitions: [availaible locale](LOCALE.md).
Expand Down
47 changes: 28 additions & 19 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM technosoft2000/alpine-base:3.8-1
MAINTAINER Technosoft2000 <technosoft2000@gmx.net>
LABEL image.version="1.2.2" \
LABEL image.version="1.2.3" \
image.description="Docker image for Calibre Web, based on docker image of Alpine" \
image.date="2018-08-28" \
image.date="2018-09-09" \
url.docker="https://hub.docker.com/r/technosoft2000/calibre-web" \
url.github="https://github.com/Technosoft2000/docker-calibre-web" \
url.support="https://cytec.us/forum"

# Set basic environment settings
ENV \
# - VERSION: the docker image version (corresponds to the above LABEL image.version)
VERSION="1.2.2" \
VERSION="1.2.3" \

# - LANG, LANGUAGE, LC_ALL: language dependent settings (Default: en_US.UTF-8)
LANG="en_US.UTF-8" \
LANGUAGE="en_US.UTF-8" \
Expand Down Expand Up @@ -39,7 +39,7 @@ ENV \

# - CALIBRE_PATH: Configure the path where the Calibre database is located
CALIBRE_PATH="/books" \

# - PKG_*: the needed applications for installation
PKG_DEV="make gcc g++ python-dev openssl-dev libffi-dev libxml2-dev libxslt-dev" \
PKG_PYTHON="ca-certificates py-pip python py-libxml2 py-libxslt py-lxml libev" \
Expand Down Expand Up @@ -74,14 +74,14 @@ RUN \

apk add --no-cache --virtual=.build-dependencies wget ca-certificates && \
apk add --no-cache parallel && \

wget "https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" \
-O "/etc/apk/keys/sgerrand.rsa.pub" && \

wget "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
"$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
"$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \

apk add --no-cache \
"$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
"$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
Expand Down Expand Up @@ -207,18 +207,27 @@ ENV \
LC_ALL="C" \
CALIBRE_INSTALLER_SOURCE_CODE_URL="https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py"

RUN apk update && \
RUN \
apk update && \
apk add --no-cache --upgrade \
bash \
ca-certificates \
gcc \
mesa-gl \
python \
qt5-qtbase-x11 \
xdg-utils \
xz \
wget && \
wget -O- ${CALIBRE_INSTALLER_SOURCE_CODE_URL} | python -c "import sys; main=lambda:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main(install_dir='/opt', isolated=True)" && \
bash \
ca-certificates \
gcc \
libxcomposite \
mesa-gl \
python \
qt5-qtbase-x11 \
xdg-utils \
xz \
wget && \

wget -O- ${CALIBRE_INSTALLER_SOURCE_CODE_URL} | \
python -c \
"import sys; \
main=lambda:sys.stderr.write('Download failed\n'); \
exec(sys.stdin.read()); \
main(install_dir='/opt', isolated=True)" && \

rm -rf /tmp/calibre-installer-cache && \

# remove not needed packages
Expand Down
22 changes: 9 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,10 @@ And if you are interested in the original __Calibre__ ebook management tool then

## Updates ##

**2018-08-28 - v1.2.2**

* glibc locale are generated now for the following definitions: [availaible locale](LOCALE.md).
* fixed issue **ebook-convert : Error: unsupported locale setting** #34
* updated README.md with new sections:
- Configuration of a converter
- Known issues
- Container Locale
**2018-09-09 - v1.2.3**
* added missing dependency **libxcomposite** which is needed for PDF related conversions via `ebook-convert`
* Updated Libraries
- Sqlalchemy v1.2.10 => v1.2.11
- Calibre converter ebook-convert (calibre 3.29.0) => (calibre 3.30.0)
- Gevent v1.3.5 => v1.3.6
- Calibre converter ebook-convert (calibre 3.30.0) => (calibre 3.31.0)

| **Program library** | **Installed Version** |
| ------------------- | --------------------- |
Expand All @@ -64,12 +56,16 @@ And if you are interested in the original __Calibre__ ebook management tool then
| Python | 2.7.15 (default, May 10 2018, 21:00:22) [GCC 6.4.0] |
| Sqlalchemy | v1.2.11 |
| Iso 639 | v0.4.5 |
| Calibre converter | ebook-convert (calibre 3.30.0) |
| Gevent | v1.3.6 |
| Calibre converter | ebook-convert (calibre 3.31.0) |
| Requests | v2.19.1 |
| Gevent | v1.3.6 |
| Flask Login | v0.4.1 |
| Flask Principal | v0.4.0 |

* `ebook-convert` supports the following target formats:
**EPUB, AZW3, MOBI, DOCX, FB2, HTMLZ, LIT, LRF, PDB, PDF, PMLZ, RB, RTF, SNB, TCR, TXT, TXTZ, ZIP**
see also at https://manual.calibre-ebook.com/generated/en/ebook-convert.html

For previous changes see at [full changelog](CHANGELOG.md).

## Features ##
Expand Down

0 comments on commit 6e8e2fc

Please sign in to comment.