Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable use in addons #137

Closed
wants to merge 1 commit into from
Closed

Enable use in addons #137

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion 5.2/5.2.1/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN useradd --system -m -d /plone -U -u 500 plone \
COPY buildout.cfg /plone/instance/

RUN buildDeps="dpkg-dev gcc libbz2-dev libc6-dev libffi-dev libjpeg62-turbo-dev libopenjp2-7-dev libpcre3-dev libssl-dev libtiff5-dev libxml2-dev libxslt1-dev wget zlib1g-dev" \
&& runDeps="gosu libjpeg62 libopenjp2-7 libtiff5 libxml2 libxslt1.1 lynx netcat poppler-utils rsync wv" \
&& runDeps="gosu libjpeg62 libopenjp2-7 libtiff5 libxml2 libxslt1.1 lynx make netcat poppler-utils rsync wv" \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We intentionally removed gcc/make from this image in order to make it more lighter and secure.

99% of the cases you shouldn't need to build libraries from source code within container. For the remaining of 1% we encourage people to create custom Docker images based on this one and do the compilation at the image level.

&& apt-get update \
&& apt-get install -y --no-install-recommends $buildDeps \
&& wget -O Plone.tgz https://launchpad.net/plone/$PLONE_MAJOR/$PLONE_VERSION/+download/$PLONE_VERSION_RELEASE.tgz \
Expand All @@ -33,6 +33,10 @@ RUN buildDeps="dpkg-dev gcc libbz2-dev libc6-dev libffi-dev libjpeg62-turbo-dev
&& pip install pip==$PIP setuptools==$SETUPTOOLS zc.buildout==$ZC_BUILDOUT wheel==$WHEEL \
&& cd /plone/instance \
&& buildout \
&& mkdir /plone/.buildout \
&& echo "[buildout]" > /plone/.buildout/default.cfg \
&& echo "download-cache = /plone/buildout-cache/downloads" >> /plone/.buildout/default.cfg \
&& echo "eggs-directory = /plone/buildout-cache/eggs" >> /plone/.buildout/default.cfg \
Comment on lines +36 to +39
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be needed as it's the default place where downloads and eggs are stored.

&& ln -s /data/filestorage/ /plone/instance/var/filestorage \
&& ln -s /data/blobstorage /plone/instance/var/blobstorage \
&& find /data -not -user plone -exec chown plone:plone {} \+ \
Expand Down