Skip to content

Commit 591fc47

Browse files
committed
chore: refactored zope 5 base image
1 parent 6bd08d9 commit 591fc47

22 files changed

Lines changed: 1000 additions & 766 deletions

Dockerfile

Lines changed: 118 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,120 @@
1-
FROM eeacms/zope:2.13.30
2-
MAINTAINER "EEA: IDM2 C-TEAM" <eea-edw-c-team-alerts@googlegroups.com>
3-
4-
ENV LOCAL_CONVERTERS_HOST=converter
5-
6-
USER root
7-
COPY src/* $ZOPE_HOME/
8-
COPY zope-setup.sh \
9-
debug.sh \
10-
docker-entrypoint.sh \
11-
docker-initialize.py /
12-
13-
RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list \
14-
&& buildDeps="gcc g++" \
15-
&& runDeps="gosu libjpeg62 libopenjp2-7 libtiff5 libxml2 libxslt1.1 libssl1.1="1.1.0l-1~deb9u1" lynx netcat poppler-utils rsync wv git-core libsasl2-dev python-dev libldap2-dev libssl-dev curl iputils-ping iproute2 vim cron netcat-openbsd sudo procps openssh-client" \
16-
&& apt-get update \
17-
&& apt-get install -y --no-install-recommends $buildDeps \
18-
&& apt-get install -y --no-install-recommends --allow-downgrades $runDeps \
19-
&& echo "zope-www ALL = NOPASSWD: /etc/init.d/cron" > /etc/sudoers \
20-
&& pip install python-ldap==2.4.38 PasteDeploy==2.1.1 pathlib==1.0.1 python-dateutil Paste==3.6.1 \
21-
&& cd $ZOPE_HOME && ./install.sh \
22-
&& chown -R 500:500 $ZOPE_HOME \
23-
&& apt-get purge -y --auto-remove $buildDeps \
24-
&& rm -rf /var/lib/apt/lists/*
1+
# syntax=docker/dockerfile:1
2+
# Docker Hardened Images (DHI) - Requires: docker login dhi.io
3+
# See: https://docs.docker.com/dhi/
4+
5+
ARG PYTHON_VERSION=3.12
6+
ARG DEBIAN_VERSION=debian13
7+
8+
# ============================================================================
9+
# Builder Stage - Uses -dev variant with build tools
10+
# ============================================================================
11+
FROM dhi.io/python:${PYTHON_VERSION}-${DEBIAN_VERSION}-dev AS builder
12+
13+
COPY --from=dhi.io/uv:0 /uv /usr/local/bin/uv
14+
15+
ENV PYTHONUNBUFFERED=1 \
16+
PYTHONDONTWRITEBYTECODE=1 \
17+
UV_COMPILE_BYTECODE=1 \
18+
ZOPE_HOME=/opt/zope \
19+
ZOPE_UID=1000 \
20+
ZOPE_GID=1000
21+
22+
ENV ZIP_CACHE_PATH=${ZOPE_HOME}/var
23+
24+
# Install build dependencies (including passwd for user management)
25+
RUN apt-get update && \
26+
apt-get install -y --no-install-recommends \
27+
build-essential \
28+
ca-certificates \
29+
curl \
30+
git \
31+
libldap2-dev \
32+
libmagic1 \
33+
libsasl2-dev \
34+
wget \
35+
zlib1g-dev && \
36+
rm -rf /var/lib/apt/lists/*
37+
38+
# Create virtual environment
39+
RUN uv venv $ZOPE_HOME
40+
41+
# Copy and install requirements
42+
COPY requirements.txt $ZOPE_HOME/
43+
RUN uv pip install --python=$ZOPE_HOME/bin/python -r $ZOPE_HOME/requirements.txt
44+
45+
# Clone and install Products.Reportek from git
46+
RUN git clone --branch wip_migration_to_zope4_5_py3 --single-branch \
47+
https://github.com/eea/Products.Reportek.git $ZOPE_HOME/src/Products.Reportek && \
48+
rm -rf $ZOPE_HOME/src/Products.Reportek/.git && \
49+
uv pip install --python=$ZOPE_HOME/bin/python -e $ZOPE_HOME/src/Products.Reportek
50+
51+
# Create directory structure
52+
RUN mkdir -p $ZOPE_HOME/etc \
53+
$ZOPE_HOME/var/filestorage \
54+
$ZOPE_HOME/var/blobstorage \
55+
$ZOPE_HOME/var/cache \
56+
$ZOPE_HOME/var/log
57+
58+
# Copy configuration files
59+
COPY src/zope.ini $ZOPE_HOME/etc/
60+
COPY src/zope.conf $ZOPE_HOME/etc/
61+
COPY src/site.zcml $ZOPE_HOME/etc/
62+
63+
# Pre-compile translation files
64+
ENV zope_i18n_compile_mo_files=true
65+
66+
# ============================================================================
67+
# Runtime Stage - Uses -dev variant (runtime variant has no shell)
68+
# ============================================================================
69+
FROM dhi.io/python:${PYTHON_VERSION}-${DEBIAN_VERSION}-dev AS runtime
70+
71+
ENV PYTHONUNBUFFERED=1 \
72+
PYTHONDONTWRITEBYTECODE=1 \
73+
ZOPE_HOME=/opt/zope \
74+
ZOPE_UID=1000 \
75+
ZOPE_GID=1000
76+
77+
ENV ZIP_CACHE_PATH=${ZOPE_HOME}/var
78+
79+
# Install runtime dependencies (including passwd for user management)
80+
RUN apt-get update && \
81+
apt-get install -y --no-install-recommends \
82+
cron \
83+
gosu \
84+
libldap2 \
85+
libmagic1 \
86+
libsasl2-2 \
87+
poppler-utils \
88+
procps \
89+
wv && \
90+
rm -rf /var/lib/apt/lists/*
91+
92+
# Create user after installing passwd package
93+
RUN groupadd -g ${ZOPE_GID} zope-www && \
94+
useradd -g ${ZOPE_GID} -u ${ZOPE_UID} -m -s /bin/bash zope-www
95+
96+
# Configure OpenLDAP
97+
RUN mkdir -p /etc/ldap && \
98+
echo "TLS_CACERT /etc/ssl/certs/ca-certificates.crt" > /etc/ldap/ldap.conf
99+
100+
# Copy installation from builder
101+
COPY --from=builder --chown=${ZOPE_UID}:${ZOPE_GID} $ZOPE_HOME $ZOPE_HOME
102+
103+
# Copy entrypoint
104+
COPY src/docker-entrypoint.sh /
105+
RUN chmod +x /docker-entrypoint.sh
106+
107+
# Environment
108+
ENV zope_i18n_compile_mo_files=true \
109+
ZOPE_HOME=/opt/zope
110+
111+
WORKDIR $ZOPE_HOME
112+
EXPOSE 8080
113+
114+
HEALTHCHECK --interval=1m --timeout=5s --start-period=1m \
115+
CMD nc -z -w5 127.0.0.1 8080 || exit 1
116+
117+
ENTRYPOINT ["/docker-entrypoint.sh"]
118+
CMD ["start"]
25119

26120
USER zope-www

Jenkinsfile

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)