Skip to content

Commit 0e40430

Browse files
nutjob4lifenutjob4life
committed
Resolve #136 
1 parent 1d6f204 commit 0e40430

3 files changed

Lines changed: 38 additions & 18 deletions

File tree

‎Dockerfile‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ FROM python:2.7.17-alpine3.11
5353

5454
ENV \
5555
URLLIB3=1.26.6 \
56-
PIP=9.0.3 \
56+
PIP=19.2 \
5757
ZC_BUILDOUT=2.12.1 \
5858
SETUPTOOLS=39.1.0 \
59-
PIP=19.2 \
6059
WHEEL=0.31.1 \
6160
PLONE_MAJOR=5.2 \
6261
PLONE_VERSION=5.2.2 \
@@ -91,6 +90,7 @@ RUN : &&\
9190
COPY --chown=edrn:edrn buildout.cfg docker.cfg /plone/instance/
9291
COPY --chown=edrn:edrn etc /plone/instance/etc
9392
COPY --chown=edrn:edrn src /plone/instance/src
93+
COPY --chown=edrn:edrn patches /plone/instance/patches
9494
COPY docker-initialize.py docker-entrypoint.sh /
9595

9696

@@ -107,7 +107,7 @@ RUN : &&\
107107
: More Twit-lock &&\
108108
apk del tiff &&\
109109
: We will uninstall these later &&\
110-
buildDeps="gcc bzip2-dev musl-dev libjpeg-turbo-dev openjpeg-dev pcre-dev openssl-dev tiff-dev libxml2-dev libxslt-dev zlib-dev openldap-dev cyrus-sasl-dev libffi-dev" &&\
110+
buildDeps="patch gcc bzip2-dev musl-dev libjpeg-turbo-dev openjpeg-dev pcre-dev openssl-dev tiff-dev libxml2-dev libxslt-dev zlib-dev openldap-dev cyrus-sasl-dev libffi-dev" &&\
111111
apk add --virtual plone-build $buildDeps &&\
112112
: These stay &&\
113113
runDeps="curl krb5-libs@edge openjpeg@edge libldap@edge libsasl libjpeg-turbo tiff libxml2 libxslt lynx netcat-openbsd libstdc++@edge libgcc@edge sqlite-libs@edge poppler-utils@edge rsync wv su-exec bash" &&\
@@ -205,8 +205,6 @@ RUN : &&\
205205
ln -s /data/blobstorage /plone/instance/var/blobstorage &&\
206206
chown -R edrn:edrn /plone /data &&\
207207
rm -rf /Plone* &&\
208-
apk del plone-build &&\
209-
rm -rf /plone/buildout-cache/downloads/* /var/cache/apk/* &&\
210208
:
211209

212210

@@ -239,14 +237,20 @@ RUN : &&\
239237
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/PcxImagePlugin.pyo \
240238
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/EpsImagePlugin.py \
241239
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/EpsImagePlugin.pyc \
242-
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/EpsImagePlugin.pyo &&\
243-
apk add apk-tools@edge busybox@edge &&\
240+
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/EpsImagePlugin.pyo \
241+
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/ImageColor.pyc \
242+
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/ImageColor.pyo &&\
243+
patch -p0 </plone/instance/patches/pil.patch &&\
244+
apk del plone-build &&\
245+
apk add apk-tools@edge busybox@edge ncurses-libs@edge ncurses-terminfo-base@edge &&\
244246
curl --silent --location $UNDERSCORE_TARBALL | tar x -f - -C /tmp -z underscore-1.12.1/underscore.js underscore-1.12.1/underscore-min.js &&\
245247
cp /tmp/underscore-1.12.1/underscore-min.js /plone/buildout-cache/eggs/plone.staticresources-1.4.1-py2.7.egg/plone/staticresources/static/components/underscore &&\
246248
cp /tmp/underscore-1.12.1/underscore.js /plone/buildout-cache/eggs/plone.staticresources-1.4.1-py2.7.egg/plone/staticresources/static/components/underscore &&\
247249
cp /tmp/underscore-1.12.1/underscore.js /plone/buildout-cache/eggs/plone.staticresources-1.4.1-py2.7.egg/plone/staticresources/static/components/backbone.paginator/examples/libs &&\
248250
rm -rf /tmp/underscore-1.12.1 &&\
249251
/usr/local/bin/pip install --upgrade pip==$PIP &&\
252+
rm -rf /plone/instance/patches &&\
253+
rm -rf /plone/buildout-cache/downloads/* /var/cache/apk/* &&\
250254
:
251255

252256

‎Dockerfile-nci‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ RUN : &&\
9090
COPY --chown=edrn:edrn buildout.cfg docker.cfg /plone/instance/
9191
COPY --chown=edrn:edrn etc /plone/instance/etc
9292
COPY --chown=edrn:edrn src /plone/instance/src
93+
COPY --chown=edrn:edrn patches /plone/instance/patches
9394
COPY docker-initialize.py docker-entrypoint.sh /
9495

9596

@@ -106,7 +107,7 @@ RUN : &&\
106107
: More Twit-lock &&\
107108
apk del tiff &&\
108109
: We will uninstall these later &&\
109-
buildDeps="gcc bzip2-dev musl-dev libjpeg-turbo-dev openjpeg-dev pcre-dev openssl-dev tiff-dev libxml2-dev libxslt-dev zlib-dev openldap-dev cyrus-sasl-dev libffi-dev" &&\
110+
buildDeps="patch gcc bzip2-dev musl-dev libjpeg-turbo-dev openjpeg-dev pcre-dev openssl-dev tiff-dev libxml2-dev libxslt-dev zlib-dev openldap-dev cyrus-sasl-dev libffi-dev" &&\
110111
apk add --virtual plone-build $buildDeps &&\
111112
: These stay &&\
112113
runDeps="curl krb5-libs@edge openjpeg@edge libldap@edge libsasl libjpeg-turbo tiff libxml2 libxslt lynx netcat-openbsd libstdc++@edge libgcc@edge sqlite-libs@edge poppler-utils@edge rsync wv su-exec bash" &&\
@@ -204,8 +205,6 @@ RUN : &&\
204205
ln -s /data/blobstorage /plone/instance/var/blobstorage &&\
205206
chown -R edrn:edrn /plone /data &&\
206207
rm -rf /Plone* &&\
207-
apk del plone-build &&\
208-
rm -rf /plone/buildout-cache/downloads/* /var/cache/apk/* &&\
209208
:
210209

211210

@@ -238,14 +237,20 @@ RUN : &&\
238237
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/PcxImagePlugin.pyo \
239238
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/EpsImagePlugin.py \
240239
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/EpsImagePlugin.pyc \
241-
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/EpsImagePlugin.pyo &&\
242-
apk add apk-tools@edge busybox@edge &&\
243-
curl --silent --location $UNDERSCORE_TARBALL | tar x -f - -C /tmp -z underscore-1.12.1/underscore.js underscore-1.12.1/underscore-min.js &&\
244-
cp /tmp/underscore-1.12.1/underscore-min.js /plone/buildout-cache/eggs/plone.staticresources-1.4.1-py2.7.egg/plone/staticresources/static/components/underscore &&\
245-
cp /tmp/underscore-1.12.1/underscore.js /plone/buildout-cache/eggs/plone.staticresources-1.4.1-py2.7.egg/plone/staticresources/static/components/underscore &&\
246-
cp /tmp/underscore-1.12.1/underscore.js /plone/buildout-cache/eggs/plone.staticresources-1.4.1-py2.7.egg/plone/staticresources/static/components/backbone.paginator/examples/libs &&\
247-
rm -rf /tmp/underscore-1.12.1 &&\
248-
/usr/local/bin/pip install --upgrade pip==$PIP &&\
240+
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/EpsImagePlugin.pyo \
241+
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/ImageColor.pyc \
242+
/plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/ImageColor.pyo &&\
243+
patch -p0 </plone/instance/patches/pil.patch &&\
244+
apk del plone-build &&\
245+
apk add apk-tools@edge busybox@edge ncurses-libs@edge ncurses-terminfo-base@edge &&\
246+
curl --silent --location $UNDERSCORE_TARBALL | tar x -f - -C /tmp -z underscore-1.12.1/underscore.js underscore-1.12.1/underscore-min.js &&\
247+
cp /tmp/underscore-1.12.1/underscore-min.js /plone/buildout-cache/eggs/plone.staticresources-1.4.1-py2.7.egg/plone/staticresources/static/components/underscore &&\
248+
cp /tmp/underscore-1.12.1/underscore.js /plone/buildout-cache/eggs/plone.staticresources-1.4.1-py2.7.egg/plone/staticresources/static/components/underscore &&\
249+
cp /tmp/underscore-1.12.1/underscore.js /plone/buildout-cache/eggs/plone.staticresources-1.4.1-py2.7.egg/plone/staticresources/static/components/backbone.paginator/examples/libs &&\
250+
rm -rf /tmp/underscore-1.12.1 &&\
251+
/usr/local/bin/pip install --upgrade pip==$PIP &&\
252+
rm -rf /plone/instance/patches &&\
253+
rm -rf /plone/buildout-cache/downloads/* /var/cache/apk/* &&\
249254
:
250255

251256

‎patches/pil.patch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- /plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/ImageColor.py.orig
2+
+++ /plone/buildout-cache/eggs/Pillow-6.2.2-py2.7-linux-x86_64.egg/PIL/ImageColor.py
3+
@@ -32,6 +32,8 @@
4+
:param color: A color string
5+
:return: ``(red, green, blue[, alpha])``
6+
"""
7+
+ if len(color) > 100:
8+
+ raise ValueError("color specifier is too long")
9+
color = color.lower()
10+
11+
rgb = colormap.get(color, None)

0 commit comments

Comments
 (0)