mirror of
https://github.com/imtbl/hydrus-server-docker
synced 2024-06-14 08:34:56 +12:00
Merge branch 'release/3.7.0'
This commit is contained in:
commit
d126967dbc
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]
|
||||||
|
|
||||||
|
## [3.7.0] - 2019-07-28
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
+ Updated hydrus server version
|
||||||
|
+ Updated base image to Debian Buster
|
||||||
|
|
||||||
## [3.6.0] - 2019-07-05
|
## [3.6.0] - 2019-07-05
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
@ -214,7 +221,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
||||||
|
|
||||||
+ Initial release
|
+ Initial release
|
||||||
|
|
||||||
[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/3.6.0...develop
|
[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/3.7.0...develop
|
||||||
|
[3.7.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.6.0...3.7.0
|
||||||
[3.6.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.5.0...3.6.0
|
[3.6.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.5.0...3.6.0
|
||||||
[3.5.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.4.0...3.5.0
|
[3.5.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.4.0...3.5.0
|
||||||
[3.4.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.3.0...3.4.0
|
[3.4.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.3.0...3.4.0
|
||||||
|
|
34
Dockerfile
34
Dockerfile
|
@ -1,4 +1,4 @@
|
||||||
FROM python:3.7-slim-stretch
|
FROM python:3.7-slim-buster
|
||||||
|
|
||||||
ARG HOST_USER_ID=1000
|
ARG HOST_USER_ID=1000
|
||||||
ARG HOST_GROUP_ID=1000
|
ARG HOST_GROUP_ID=1000
|
||||||
|
@ -21,37 +21,43 @@ COPY ./deb .
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
chown -R hydrus:hydrus /usr/src/app && \
|
chown -R hydrus:hydrus /usr/src/app && \
|
||||||
chmod +x server.py && \
|
chmod +x \
|
||||||
chmod +x bin/swfrender_linux bin/upnpc_linux && \
|
server.py \
|
||||||
|
bin/swfrender_linux \
|
||||||
|
bin/upnpc_linux && \
|
||||||
rm \
|
rm \
|
||||||
bin/swfrender_osx \
|
bin/swfrender_osx \
|
||||||
bin/swfrender_win32.exe \
|
bin/swfrender_win32.exe \
|
||||||
bin/upnpc_osx \
|
bin/upnpc_osx \
|
||||||
bin/upnpc_win32.exe && \
|
bin/upnpc_win32.exe && \
|
||||||
mkdir /data && chown -R hydrus:hydrus /data && \
|
mkdir /data && \
|
||||||
|
chown -R hydrus:hydrus /data && \
|
||||||
apt-get update && apt-get install -y \
|
apt-get update && apt-get install -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
ffmpeg \
|
ffmpeg \
|
||||||
|
multiarch-support \
|
||||||
wget && \
|
wget && \
|
||||||
dpkg -i libjpeg8_8d-1+deb7u1_amd64.deb && \
|
dpkg -i libjpeg8_8d-2_amd64.deb && \
|
||||||
rm libjpeg8_8d-1+deb7u1_amd64.deb && \
|
rm libjpeg8_8d-2_amd64.deb && \
|
||||||
|
pip install --upgrade pip && \
|
||||||
pip install virtualenv && \
|
pip install virtualenv && \
|
||||||
virtualenv venv && \
|
virtualenv venv && \
|
||||||
. venv/bin/activate && \
|
. venv/bin/activate && \
|
||||||
pip install \
|
pip install \
|
||||||
beautifulsoup4~=4.7.1 \
|
beautifulsoup4~=4.8.0 \
|
||||||
|
chardet~=3.0.4 \
|
||||||
lz4~=2.1.10 \
|
lz4~=2.1.10 \
|
||||||
numpy~=1.16.4 \
|
numpy~=1.17.0 \
|
||||||
pillow~=5.4.1 \
|
pillow~=6.1.0 \
|
||||||
psutil~=5.4.8 \
|
psutil~=5.6.3 \
|
||||||
pylzma~=0.5.0 \
|
pylzma~=0.5.0 \
|
||||||
pyopenssl~=18.0.0 \
|
pyopenssl~=19.0.0 \
|
||||||
pyyaml~=3.13 \
|
pyyaml~=5.1.1 \
|
||||||
opencv-python-headless~=4.1.0.25 \
|
opencv-python-headless~=4.1.0.25 \
|
||||||
requests~=2.21.0 \
|
requests~=2.22.0 \
|
||||||
send2trash~=1.5.0 \
|
send2trash~=1.5.0 \
|
||||||
service_identity~=18.1.0 \
|
service_identity~=18.1.0 \
|
||||||
twisted~=18.9.0 && \
|
twisted~=19.2.1 && \
|
||||||
rm -r ~/.cache && \
|
rm -r ~/.cache && \
|
||||||
apt-get clean && apt-get autoclean && apt-get autoremove --purge -y && \
|
apt-get clean && apt-get autoclean && apt-get autoremove --purge -y && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
|
@ -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 358][hydrus-server-version].
|
The latest build runs [hydrus server version 360][hydrus-server-version].
|
||||||
|
|
||||||
## Table of contents
|
## Table of contents
|
||||||
|
|
||||||
|
@ -34,7 +34,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 mserajnik/hydrus-server-docker:358
|
user@local:~$ docker pull mserajnik/hydrus-server-docker:360
|
||||||
```
|
```
|
||||||
|
|
||||||
See [here][docker-hub-tags] for all the available version numbers/tags.
|
See [here][docker-hub-tags] for all the available version numbers/tags.
|
||||||
|
@ -169,13 +169,13 @@ You are welcome to help out!
|
||||||
[MIT](LICENSE.md) © Michael Serajnik
|
[MIT](LICENSE.md) © Michael Serajnik
|
||||||
|
|
||||||
[hydrus-server]: http://hydrusnetwork.github.io/hydrus/
|
[hydrus-server]: http://hydrusnetwork.github.io/hydrus/
|
||||||
[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v358
|
[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v360
|
||||||
[docker-hub]: https://hub.docker.com/r/mserajnik/hydrus-server-docker/
|
[docker-hub]: https://hub.docker.com/r/mserajnik/hydrus-server-docker/
|
||||||
[docker-hub-tags]: https://hub.docker.com/r/mserajnik/hydrus-server-docker/tags/
|
[docker-hub-tags]: https://hub.docker.com/r/mserajnik/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%20358-blue.svg
|
[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20360-blue.svg
|
||||||
|
|
||||||
[travis]: https://travis-ci.com/mserajnik/hydrus-server-docker
|
[travis]: https://travis-ci.com/mserajnik/hydrus-server-docker
|
||||||
[travis-badge]: https://travis-ci.com/mserajnik/hydrus-server-docker.svg
|
[travis-badge]: https://travis-ci.com/mserajnik/hydrus-server-docker.svg
|
||||||
|
|
Binary file not shown.
BIN
deb/libjpeg8_8d-2_amd64.deb
Normal file
BIN
deb/libjpeg8_8d-2_amd64.deb
Normal file
Binary file not shown.
2
hydrus
2
hydrus
|
@ -1 +1 @@
|
||||||
Subproject commit 916b8f3c940715f02f46046ccf947ef9b764c2c1
|
Subproject commit 9b02a8fce61e76b8b8919183578d9242169cf796
|
Loading…
Reference in a new issue