diff --git a/.woodpecker/build_docker.yml b/.woodpecker/build_docker.yml index 86e580a..b39268c 100644 --- a/.woodpecker/build_docker.yml +++ b/.woodpecker/build_docker.yml @@ -30,6 +30,7 @@ pipeline: dockerfile: docker/Dockerfile.amd64 auto_tag: true auto_tag_suffix: linux-amd64 + build_args: BUILD_DATE="$(date +%Y-%m-%d_%H:%M)" # build docker image for arm64 dryrun-build-arm64: @@ -44,5 +45,6 @@ pipeline: platforms: linux/arm64 dockerfile: docker/Dockerfile.arm64 auto_tag: true - auto_tag_suffix: linux-arm64 + auto_tag_suffix: linux-arm64# + build_args: BUILD_DATE="$(date +%Y-%m-%d_%H:%M)" diff --git a/.woodpecker/publish_docker.yml b/.woodpecker/publish_docker.yml index 364bd83..9e71224 100644 --- a/.woodpecker/publish_docker.yml +++ b/.woodpecker/publish_docker.yml @@ -29,6 +29,7 @@ pipeline: dockerfile: docker/Dockerfile.amd64 auto_tag: true auto_tag_suffix: linux-amd64 + build_args: BUILD_DATE="$(date +%Y-%m-%d_%H:%M)" username: from_secret: cr-dhub-username password: @@ -47,6 +48,7 @@ pipeline: dockerfile: docker/Dockerfile.arm64 auto_tag: true auto_tag_suffix: linux-arm64 + build_args: BUILD_DATE="$(date +%Y-%m-%d_%H:%M)" username: from_secret: cr-dhub-username password: diff --git a/CHANGELOG.md b/CHANGELOG.md index 7901524..fc45cfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Add support for more sites +## [2.1.5] - 2022-06-17 + +### Fixed + +- Image names now have a suffix, as some comic readers have problems with no suffix + +### Added + +- `--format` section in the README + ## [2.1.4] - 2022-05-29 ### Fixed diff --git a/docker/Dockerfile.amd64 b/docker/Dockerfile.amd64 index 23068c9..2cf4d3f 100644 --- a/docker/Dockerfile.amd64 +++ b/docker/Dockerfile.amd64 @@ -1,13 +1,11 @@ FROM cr.44net.ch/baseimages/debian-s6:1.3.5 # set version label +ENV MDLP_VERSION=2.1.5 ARG BUILD_DATE -ARG VERSION -LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}" +LABEL build_version="Version: ${MDLP_VERSION} - Build-date: ${BUILD_DATE}" LABEL maintainer="Ivan Schaller" -# manga-dlp version -ENV MDLP_VERSION=2.1.4 # install packages RUN \ diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64 index a1c5510..9f92aeb 100644 --- a/docker/Dockerfile.arm64 +++ b/docker/Dockerfile.arm64 @@ -1,13 +1,11 @@ FROM cr.44net.ch/baseimages/debian-s6:1.3.5 # set version label +ENV MDLP_VERSION=2.1.5 ARG BUILD_DATE -ARG VERSION -LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}" +LABEL build_version="Version: ${MDLP_VERSION} - Build-date: ${BUILD_DATE}" LABEL maintainer="Ivan Schaller" -# manga-dlp version -ENV MDLP_VERSION=2.1.4 # install packages RUN \ diff --git a/manga-dlp.py b/manga-dlp.py index 75dfe24..1251e84 100644 --- a/manga-dlp.py +++ b/manga-dlp.py @@ -3,7 +3,7 @@ import sys from mangadlp.input import get_args -mangadlp_version = "2.1.4" +mangadlp_version = "2.1.5" def get_input(): diff --git a/mangadlp/input.py b/mangadlp/input.py index 4ae6871..d9096fe 100644 --- a/mangadlp/input.py +++ b/mangadlp/input.py @@ -4,7 +4,7 @@ from pathlib import Path import mangadlp.app as app -mangadlp_version = "2.1.4" +mangadlp_version = "2.1.5" def check_args(args): diff --git a/setup.py b/setup.py index 151d055..f2e591c 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ long_description = readme.read_text() setuptools.setup( name="manga-dlp", - version="2.1.4", + version="2.1.5", author="Ivan Schaller", author_email="ivan@schaller.sh", description="A cli manga downloader",