Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix Docker linux arm #746

Merged
merged 8 commits into from
Sep 29, 2024
Merged

fix Docker linux arm #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
37a2e66
fix linux arm64
axu2 Sep 28, 2024
9ba30e8
Update Dockerfile-base
axu2 Sep 28, 2024
2188cee
Update Dockerfile
axu2 Sep 28, 2024
e23d598
Update Dockerfile-base
axu2 Sep 28, 2024
550bf4a
ENV PATH="/opt/venv/bin:$PATH"
axu2 Sep 29, 2024
34fc031
fix docker armv7
axu2 Sep 29, 2024
3a01c75
Update Dockerfile-base
axu2 Sep 29, 2024
76a07da
Update Dockerfile-base
axu2 Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Select final stage based on TARGETARCH ARG
FROM ghcr.io/ciromattia/kcc:docker-base-20230809
FROM ghcr.io/ciromattia/kcc:docker-base-20240928
LABEL com.kcc.name="Kindle Comic Converter"
LABEL com.kcc.author="Ciro Mattia Gonano, Paweł Jastrzębski and Darodi"
LABEL org.opencontainers.image.description='Kindle Comic Converter'
Expand All @@ -16,4 +16,4 @@ COPY . /opt/kcc
RUN cat /opt/kcc/kindlecomicconverter/__init__.py | grep version | awk '{print $3}' | sed "s/'//g" > /IMAGE_VERSION

ENTRYPOINT ["/opt/kcc/kcc-c2e.py"]
CMD ["-h"]
CMD ["-h"]
14 changes: 9 additions & 5 deletions Dockerfile-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ ENV LC_ALL=C.UTF-8 \

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

COPY requirements.txt /opt/kcc/
ENV PATH="/opt/venv/bin:$PATH"

RUN set -x && \
TEMP_PACKAGES=() && \
KEPT_PACKAGES=() && \
Expand Down Expand Up @@ -64,9 +67,8 @@ RUN set -x && \
&& \
# Install required python modules
python -m pip install --upgrade pip && \
# python -m pip install -r /opt/kcc/requirements.txt && \
python -m venv /opt/venv && \
python -m pip install --upgrade pillow python-slugify psutil raven mozjpeg-lossless-optimization
python -m pip install -r /opt/kcc/requirements.txt


######################################################################################
Expand All @@ -83,6 +85,9 @@ ENV LC_ALL=C.UTF-8 \

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

COPY requirements.txt /opt/kcc/
ENV PATH="/opt/venv/bin:$PATH"

RUN set -x && \
TEMP_PACKAGES=() && \
KEPT_PACKAGES=() && \
Expand Down Expand Up @@ -120,9 +125,8 @@ RUN set -x && \
&& \
# Install required python modules
python -m pip install --upgrade pip && \
# python -m pip install -r /opt/kcc/requirements.txt && \
python -m venv /opt/venv && \
python -m pip install --upgrade pillow python-slugify psutil raven mozjpeg-lossless-optimization
python -m pip install --upgrade pillow psutil requests python-slugify raven packaging mozjpeg-lossless-optimization natsort[fast] distro


######################################################################################
Expand Down Expand Up @@ -156,5 +160,5 @@ WORKDIR /app
RUN DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \
apt-get install -y p7zip-full unrar-free && \
ln -s /app/kindlegen /bin/kindlegen && \
echo docker-base-20230809 > /IMAGE_VERSION
echo docker-base-20240928 > /IMAGE_VERSION

Loading