Skip to content

Commit

Permalink
Remove nassl build from Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
mxsasha committed Jan 19, 2024
1 parent 4308a73 commit f77f3cb
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 28 deletions.
9 changes: 0 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
[submodule "vendor/unbound"]
path = vendor/unbound
url = https://github.com/internetstandards/unbound.git
[submodule "vendor/nassl"]
path = vendor/nassl
url = https://github.com/internetstandards/nassl.git
[submodule "vendor/openssl-1.0.2e"]
path = vendor/openssl-1.0.2e
url = https://github.com/PeterMosmans/openssl.git
[submodule "vendor/openssl-master"]
path = vendor/openssl-master
url = https://github.com/openssl/openssl.git
16 changes: 0 additions & 16 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,6 @@ RUN ./configure \
RUN make
RUN make install

FROM build-deps as build-nassl

COPY vendor/nassl /src/vendor/nassl
WORKDIR /src/vendor/nassl

ADD vendor/zlib-1.2.13.tar.gz ./
COPY vendor/openssl-1.0.2e ./openssl-1.0.2e
COPY vendor/openssl-master ./openssl-master

RUN python3 build_from_scratch.py
RUN python3 setup.py install

# intermediate stage with apt and python dependencies
FROM build-deps as build-app-deps

Expand Down Expand Up @@ -151,9 +139,6 @@ RUN apt update && \
COPY --from=build-unbound /opt/unbound /opt/unbound
COPY --from=build-unbound /usr/lib/python3/dist-packages/*unbound* /usr/lib/python3/dist-packages/

# copy nassl Python module into image
COPY --from=build-nassl /usr/local/lib/python${PYTHON_VERSION}/dist-packages/nassl-*.egg /usr/local/lib/python${PYTHON_VERSION}/dist-packages/

# copy application dependencies into image
COPY --from=build-app-deps /usr/local/lib/python${PYTHON_VERSION}/dist-packages/ /usr/local/lib/python${PYTHON_VERSION}/dist-packages/
COPY --from=build-app-deps /usr/local/bin/* /usr/local/bin/
Expand All @@ -163,7 +148,6 @@ COPY --from=build-app-deps /usr/local/bin/* /usr/local/bin/
# OS updates, verify we run the desired Python version.
RUN python3 --version | grep "$PYTHON_VERSION."
RUN /opt/unbound/sbin/unbound -V
RUN python3 -c 'import nassl; print(nassl.__version__)'

COPY docker/worker/entrypoint.sh /entrypoint-worker.sh

Expand Down
1 change: 0 additions & 1 deletion vendor/nassl
Submodule nassl deleted from a16b6e
1 change: 0 additions & 1 deletion vendor/openssl-1.0.2e
Submodule openssl-1.0.2e deleted from 08802a
1 change: 0 additions & 1 deletion vendor/openssl-master
Submodule openssl-master deleted from 97ace4
Binary file removed vendor/zlib-1.2.13.tar.gz
Binary file not shown.

0 comments on commit f77f3cb

Please sign in to comment.