Skip to content

Commit c50843d

Browse files
committed
Remove nassl build from Dockerfile
1 parent 296b826 commit c50843d

File tree

6 files changed

+0
-28
lines changed

6 files changed

+0
-28
lines changed

.gitmodules

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
11
[submodule "vendor/unbound"]
22
path = vendor/unbound
33
url = https://github.com/internetstandards/unbound.git
4-
[submodule "vendor/nassl"]
5-
path = vendor/nassl
6-
url = https://github.com/internetstandards/nassl.git
7-
[submodule "vendor/openssl-1.0.2e"]
8-
path = vendor/openssl-1.0.2e
9-
url = https://github.com/PeterMosmans/openssl.git
10-
[submodule "vendor/openssl-master"]
11-
path = vendor/openssl-master
12-
url = https://github.com/openssl/openssl.git

docker/Dockerfile

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,6 @@ RUN ./configure \
4545
RUN make
4646
RUN make install
4747

48-
FROM build-deps as build-nassl
49-
50-
COPY vendor/nassl /src/vendor/nassl
51-
WORKDIR /src/vendor/nassl
52-
53-
ADD vendor/zlib-1.2.13.tar.gz ./
54-
COPY vendor/openssl-1.0.2e ./openssl-1.0.2e
55-
COPY vendor/openssl-master ./openssl-master
56-
57-
RUN python3 build_from_scratch.py
58-
RUN python3 setup.py install
59-
6048
# intermediate stage with apt and python dependencies
6149
FROM build-deps as build-app-deps
6250

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

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

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

vendor/nassl

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/openssl-1.0.2e

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/openssl-master

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/zlib-1.2.13.tar.gz

-1.43 MB
Binary file not shown.

0 commit comments

Comments
 (0)