mirror of
https://github.com/imtbl/hydrus-server-docker
synced 2024-05-15 10:03:26 +12:00
Merge branch 'release/4.3.0'
This commit is contained in:
commit
aa00796330
10
CHANGELOG.md
10
CHANGELOG.md
|
@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [4.3.0] - 2021-01-21
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
+ Updated hydrus server version
|
||||||
|
+ Updated dependencies
|
||||||
|
|
||||||
## [4.2.0] - 2020-12-09
|
## [4.2.0] - 2020-12-09
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
@ -392,7 +399,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.2.0...develop
|
[Unreleased]: https://github.com/imtbl/hydrus-server-docker/compare/4.3.0...develop
|
||||||
|
[4.3.0]: https://github.com/imtbl/hydrus-server-docker/compare/4.2.0...4.3.0
|
||||||
[4.2.0]: https://github.com/imtbl/hydrus-server-docker/compare/4.1.0...4.2.0
|
[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
|
||||||
|
|
21
Dockerfile
21
Dockerfile
|
@ -42,16 +42,16 @@ RUN \
|
||||||
. venv/bin/activate && \
|
. venv/bin/activate && \
|
||||||
pip install \
|
pip install \
|
||||||
beautifulsoup4~=4.9.3 \
|
beautifulsoup4~=4.9.3 \
|
||||||
chardet~=3.0.4 \
|
chardet~=4.0.0 \
|
||||||
lz4~=3.1.1 \
|
lz4~=3.1.3 \
|
||||||
numpy~=1.19.4 \
|
numpy~=1.19.5 \
|
||||||
opencv-python-headless~=4.4.0.46 \
|
opencv-python-headless~=4.5.1.48 \
|
||||||
pillow~=8.0.1 \
|
pillow~=8.1.0 \
|
||||||
psutil~=5.7.3 \
|
psutil~=5.8.0 \
|
||||||
pylzma~=0.5.0 \
|
pylzma~=0.5.0 \
|
||||||
pyopenssl~=20.0.0 \
|
pyopenssl~=20.0.1 \
|
||||||
pyyaml~=5.3.1 \
|
pyyaml~=5.4.1 \
|
||||||
requests~=2.25.0 \
|
requests~=2.25.1 \
|
||||||
send2trash~=1.5.0 \
|
send2trash~=1.5.0 \
|
||||||
service_identity~=18.1.0 \
|
service_identity~=18.1.0 \
|
||||||
twisted~=20.3.0 && \
|
twisted~=20.3.0 && \
|
||||||
|
@ -62,8 +62,7 @@ RUN \
|
||||||
chown -R ${USER_ID}:${GROUP_ID} /usr/src/app && \
|
chown -R ${USER_ID}:${GROUP_ID} /usr/src/app && \
|
||||||
chmod +x \
|
chmod +x \
|
||||||
server.py \
|
server.py \
|
||||||
bin/swfrender_linux \
|
bin/swfrender_linux && \
|
||||||
bin/upnpc_linux && \
|
|
||||||
mkdir /data && chown -R ${USER_ID}:${GROUP_ID} /data
|
mkdir /data && chown -R ${USER_ID}:${GROUP_ID} /data
|
||||||
|
|
||||||
COPY docker-cmd-start.sh /usr/local/bin/start
|
COPY docker-cmd-start.sh /usr/local/bin/start
|
||||||
|
|
|
@ -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 421][hydrus-server-version].
|
The latest build runs [hydrus server version 426][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:421
|
user@local:~$ docker pull mtbl/hydrus-server-docker:426
|
||||||
```
|
```
|
||||||
|
|
||||||
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/v421
|
[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v426
|
||||||
[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%20421-blue.svg
|
[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20426-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
2
hydrus
|
@ -1 +1 @@
|
||||||
Subproject commit c3100f7a881b8a8b9ab4dd238d2696500c343d45
|
Subproject commit 1acdc258e5bb2ae22f5eafaf3dac8d9265dba5e2
|
Loading…
Reference in a new issue