Skip to content

Commit 5b64e6c

Browse files
committed
applied watermark patch issue #14
1 parent 3b93bf7 commit 5b64e6c

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
FROM hyperknot/baseimage16:1.0.2 AS buildstep
1+
FROM hyperknot/baseimage16:1.0.4 AS buildstep
22
ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 \
33
TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
44
NGINX_DEVEL_KIT_VERSION=0.3.0 NGINX_SET_MISC_MODULE_VERSION=0.31 \
5-
NGINX_VERSION=1.13.8
5+
NGINX_VERSION=1.13.10
66
ADD ./build/src/ /tmp/
77
RUN bash /tmp/ubuntu.sh
88

99

10-
FROM hyperknot/baseimage16:1.0.2
10+
FROM hyperknot/baseimage16:1.0.4
1111

1212
MAINTAINER friends@niiknow.org
1313

1414
ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 \
1515
TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
16-
NGINX_VERSION=_1.13.8-1~xenial_amd64.deb \
16+
NGINX_VERSION=_1.13.10-1~xenial_amd64.deb \
1717
NGINX_DEBUG=-dbg${NGINX_VERSION}
1818

1919
COPY --from=buildstep /usr/src/nginx/nginx${NGINX_VERSION} /tmp

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ Features:
1414
- [x] support international characters in URL
1515
- [x] automatically follow redirect at origin
1616
- [x] overridable nginx config - easily add secure link or additional nginx config
17+
- [x] watermark with
18+
```
19+
image_filter watermark /path/to/watermark.png [ bottom-right (default) | top-left | top-right | bottom-left | center ];
20+
```
1721

1822
# What does this solve?
1923
You have a huge repository of images that need dynamic resize and cropping. Cloudinary can be expensive and redundant if you run your own CDN in front of this microservice.

0 commit comments

Comments
 (0)