-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
19 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| [mypy] | ||
| python_version = 3.10 | ||
| python_version = 3.11 | ||
| plugins = | ||
| mypy_django_plugin.main, | ||
| mypy_drf_plugin.main, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,7 +83,7 @@ RUN corepack enable && \ | |
| # | ||
| # --------------------------------------------------------- | ||
| # | ||
| FROM python:3.10.10-slim-bullseye AS posthog-build | ||
| FROM python:3.11.9-slim-bullseye AS posthog-build | ||
| WORKDIR /code | ||
| SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"] | ||
|
|
||
|
|
@@ -135,108 +135,10 @@ RUN apt-get update && \ | |
| ( curl -s -L "https://mmdbcdn.posthog.net/" --http1.1 | brotli --decompress --output=./share/GeoLite2-City.mmdb ) && \ | ||
| chmod -R 755 ./share/GeoLite2-City.mmdb | ||
|
|
||
|
|
||
| # | ||
| # --------------------------------------------------------- | ||
| # | ||
| # Build a version of the unit docker image for python3.10 | ||
| # We can remove this step once we are on python3.11 | ||
| FROM unit:python3.11 as unit | ||
| FROM python:3.10-bullseye as unit-131-python-310 | ||
|
|
||
| # copied from https://github.com/nginx/unit/blob/master/pkg/docker/Dockerfile.python3.11 | ||
| LABEL org.opencontainers.image.title="Unit (python3.10)" | ||
| LABEL org.opencontainers.image.description="Official build of Unit for Docker." | ||
| LABEL org.opencontainers.image.url="https://unit.nginx.org" | ||
| LABEL org.opencontainers.image.source="https://github.com/nginx/unit" | ||
| LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images" | ||
| LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>" | ||
| LABEL org.opencontainers.image.version="1.31.1" | ||
|
|
||
| RUN set -ex \ | ||
| && savedAptMark="$(apt-mark showmanual)" \ | ||
| && apt-get update \ | ||
| && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \ | ||
| && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ | ||
| && mkdir -p /usr/src/unit \ | ||
| && cd /usr/src/unit \ | ||
| && hg clone -u 1.31.1-1 https://hg.nginx.org/unit \ | ||
| && cd unit \ | ||
| && NCPU="$(getconf _NPROCESSORS_ONLN)" \ | ||
| && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \ | ||
| && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \ | ||
| && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \ | ||
| && CONFIGURE_ARGS_MODULES="--prefix=/usr \ | ||
| --statedir=/var/lib/unit \ | ||
| --control=unix:/var/run/control.unit.sock \ | ||
| --runstatedir=/var/run \ | ||
| --pid=/var/run/unit.pid \ | ||
| --logdir=/var/log \ | ||
| --log=/var/log/unit.log \ | ||
| --tmpdir=/var/tmp \ | ||
| --user=unit \ | ||
| --group=unit \ | ||
| --openssl \ | ||
| --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \ | ||
| && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ | ||
| --njs" \ | ||
| && make -j $NCPU -C pkg/contrib .njs \ | ||
| && export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \ | ||
| && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ | ||
| && make -j $NCPU unitd \ | ||
| && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ | ||
| && make clean \ | ||
| && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ | ||
| && make -j $NCPU unitd \ | ||
| && install -pm755 build/sbin/unitd /usr/sbin/unitd \ | ||
| && make clean \ | ||
| && /bin/true \ | ||
| && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ | ||
| && ./configure python --config=/usr/local/bin/python3-config \ | ||
| && make -j $NCPU python3-install \ | ||
| && make clean \ | ||
| && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \ | ||
| && ./configure python --config=/usr/local/bin/python3-config \ | ||
| && make -j $NCPU python3-install \ | ||
| && cd \ | ||
| && rm -rf /usr/src/unit \ | ||
| && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \ | ||
| ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \ | ||
| done \ | ||
| && apt-mark showmanual | xargs apt-mark auto > /dev/null \ | ||
| && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \ | ||
| && /bin/true \ | ||
| && mkdir -p /var/lib/unit/ \ | ||
| && mkdir -p /docker-entrypoint.d/ \ | ||
| && groupadd --gid 998 unit \ | ||
| && useradd \ | ||
| --uid 998 \ | ||
| --gid unit \ | ||
| --no-create-home \ | ||
| --home /nonexistent \ | ||
| --comment "unit user" \ | ||
| --shell /bin/false \ | ||
| unit \ | ||
| && apt-get update \ | ||
| && apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \ | ||
| && apt-get purge -y --auto-remove build-essential \ | ||
| && rm -rf /var/lib/apt/lists/* \ | ||
| && rm -f /requirements.apt \ | ||
| && ln -sf /dev/stdout /var/log/unit.log | ||
|
|
||
| COPY --from=unit /usr/local/bin/docker-entrypoint.sh /usr/local/bin/ | ||
| COPY --from=unit /usr/share/unit/welcome/welcome.* /usr/share/unit/welcome/ | ||
|
|
||
| STOPSIGNAL SIGTERM | ||
|
|
||
| ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] | ||
| EXPOSE 80 | ||
| CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"] | ||
|
|
||
| # | ||
| # --------------------------------------------------------- | ||
| # | ||
| FROM unit-131-python-310 | ||
| FROM unit:python3.11 | ||
| WORKDIR /code | ||
| SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"] | ||
| ENV PYTHONUNBUFFERED 1 | ||
|
|
||