1
0
Fork 0
mirror of https://github.com/imtbl/hydrus-server-docker synced 2024-05-16 02:23:32 +12:00

Merge branch 'release/4.2.0'

This commit is contained in:
imtbl 2020-12-09 23:37:44 +01:00
commit da4ac7d57c
No known key found for this signature in database
GPG key ID: 1E0CA1EF5FCB6B36
4 changed files with 18 additions and 9 deletions

View file

@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased] ## [Unreleased]
## [4.2.0] - 2020-12-09
### Changed
+ Based Docker image on Python 3.9
+ Updated hydrus server version
+ Updated dependencies
## [4.1.0] - 2020-11-11 ## [4.1.0] - 2020-11-11
### Changed ### Changed
@ -384,7 +392,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
+ Initial release + Initial release
[Unreleased]: https://github.com/imtbl/hydrus-server-docker/compare/4.1.0...develop [Unreleased]: https://github.com/imtbl/hydrus-server-docker/compare/4.2.0...develop
[4.2.0]: https://github.com/imtbl/hydrus-server-docker/compare/4.1.0...4.2.0
[4.1.0]: https://github.com/imtbl/hydrus-server-docker/compare/4.0.0...4.1.0 [4.1.0]: https://github.com/imtbl/hydrus-server-docker/compare/4.0.0...4.1.0
[4.0.0]: https://github.com/imtbl/hydrus-server-docker/compare/3.29.0...4.0.0 [4.0.0]: https://github.com/imtbl/hydrus-server-docker/compare/3.29.0...4.0.0
[3.29.0]: https://github.com/imtbl/hydrus-server-docker/compare/3.28.0...3.29.0 [3.29.0]: https://github.com/imtbl/hydrus-server-docker/compare/3.28.0...3.29.0

View file

@ -14,7 +14,7 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
FROM python:3.8-slim-buster FROM python:3.9-slim-buster
ARG USER_ID=1000 ARG USER_ID=1000
ARG GROUP_ID=1000 ARG GROUP_ID=1000
@ -43,13 +43,13 @@ RUN \
pip install \ pip install \
beautifulsoup4~=4.9.3 \ beautifulsoup4~=4.9.3 \
chardet~=3.0.4 \ chardet~=3.0.4 \
lz4~=3.1.0 \ lz4~=3.1.1 \
numpy~=1.19.4 \ numpy~=1.19.4 \
opencv-python-headless~=4.4.0.46 \ opencv-python-headless~=4.4.0.46 \
pillow~=8.0.1 \ pillow~=8.0.1 \
psutil~=5.7.3 \ psutil~=5.7.3 \
pylzma~=0.5.0 \ pylzma~=0.5.0 \
pyopenssl~=19.1.0 \ pyopenssl~=20.0.0 \
pyyaml~=5.3.1 \ pyyaml~=5.3.1 \
requests~=2.25.0 \ requests~=2.25.0 \
send2trash~=1.5.0 \ send2trash~=1.5.0 \

View file

@ -5,7 +5,7 @@
This is a simple Debian-based Docker setup for running This is a simple Debian-based Docker setup for running
[hydrus server][hydrus-server] from source. [hydrus server][hydrus-server] from source.
The latest build runs [hydrus server version 417][hydrus-server-version]. The latest build runs [hydrus server version 421][hydrus-server-version].
Due to time constraints and the fact that changes to hydrus server are Due to time constraints and the fact that changes to hydrus server are
infrequent, a new release of this Docker setup is only made roughly infrequent, a new release of this Docker setup is only made roughly
@ -40,7 +40,7 @@ By default, this will pull the latest build. To specify an image with a
specific version of hydrus server, provide the version number as tag, e.g.: specific version of hydrus server, provide the version number as tag, e.g.:
```zsh ```zsh
user@local:~$ docker pull mtbl/hydrus-server-docker:417 user@local:~$ docker pull mtbl/hydrus-server-docker:421
``` ```
Alternatively, you can also build the image yourself: Alternatively, you can also build the image yourself:
@ -162,13 +162,13 @@ You are welcome to help out!
[AGPLv3](LICENSE) © imtbl [AGPLv3](LICENSE) © imtbl
[hydrus-server]: http://hydrusnetwork.github.io/hydrus/ [hydrus-server]: http://hydrusnetwork.github.io/hydrus/
[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v417 [hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v421
[docker-hub]: https://hub.docker.com/r/mtbl/hydrus-server-docker/ [docker-hub]: https://hub.docker.com/r/mtbl/hydrus-server-docker/
[docker-hub-tags]: https://hub.docker.com/r/mtbl/hydrus-server-docker/tags/ [docker-hub-tags]: https://hub.docker.com/r/mtbl/hydrus-server-docker/tags/
[docker]: https://www.docker.com/ [docker]: https://www.docker.com/
[semantic-versioning]: https://semver.org/ [semantic-versioning]: https://semver.org/
[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20417-blue.svg [hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20421-blue.svg
[travis]: https://travis-ci.com/imtbl/hydrus-server-docker [travis]: https://travis-ci.com/imtbl/hydrus-server-docker
[travis-badge]: https://travis-ci.com/imtbl/hydrus-server-docker.svg [travis-badge]: https://travis-ci.com/imtbl/hydrus-server-docker.svg

2
hydrus

@ -1 +1 @@
Subproject commit b2d0e31b8705e698d1672275e6d1a9cdea556f5b Subproject commit c3100f7a881b8a8b9ab4dd238d2696500c343d45