Skip to content

Commit

Permalink
Use wildcards instead of hard-coding library versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@Keelan10
Keelan10 committed Jul 1, 2023
1 parent f959e50 commit e64d4d3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions ngtcp2/Dockerfile-client
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ RUN autoreconf -i && ./configure PKG_CONFIG_PATH=$PWD/../nghttp3/build/lib/pkgco

# Copy all required shared object dependencies to a single directory
RUN mkdir /opt/lib && cd /opt/lib && \
cp /opt/ngtcp2/lib/.libs/libngtcp2.so.11 . && \
cp /usr/lib/libev.so.4 . && \
cp /opt/nghttp3/build/lib/libnghttp3.so.5 . && \
cp /opt/ngtcp2/crypto/openssl/.libs/libngtcp2_crypto_openssl.so.4 . && \
cp /opt/oqssa/lib64/libssl.so.81.3 . && \
cp /opt/oqssa/lib64/libcrypto.so.81.3 . && \
cp /usr/lib/libstdc++.so.6 . && \
cp /usr/lib/libgcc_s.so.1 .
cp /opt/ngtcp2/lib/.libs/libngtcp2.so.* . && \
cp /usr/lib/libev.so.* . && \
cp /opt/nghttp3/build/lib/libnghttp3.so.* . && \
cp /opt/ngtcp2/crypto/openssl/.libs/libngtcp2_crypto_openssl.so.* . && \
cp /opt/oqssa/lib64/libssl.so.* . && \
cp /opt/oqssa/lib64/libcrypto.so.* . && \
cp /usr/lib/libstdc++.so.* . && \
cp /usr/lib/libgcc_s.so.* .

## second stage: Only create minimal image without build tooling and intermediate build results generated above:
FROM alpine as dev
Expand Down
16 changes: 8 additions & 8 deletions ngtcp2/Dockerfile-server
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ RUN echo "Generating server key and certificate" && mkdir certs && cd certs &&

# Copy all required shared object dependencies to a single directory
RUN mkdir /opt/lib && cd /opt/lib && \
cp /opt/ngtcp2/lib/.libs/libngtcp2.so.11 . && \
cp /usr/lib/libev.so.4 . && \
cp /opt/nghttp3/build/lib/libnghttp3.so.5 . && \
cp /opt/ngtcp2/crypto/openssl/.libs/libngtcp2_crypto_openssl.so.4 . && \
cp /opt/oqssa/lib64/libssl.so.81.3 . && \
cp /opt/oqssa/lib64/libcrypto.so.81.3 . && \
cp /usr/lib/libstdc++.so.6 . && \
cp /usr/lib/libgcc_s.so.1 .
cp /opt/ngtcp2/lib/.libs/libngtcp2.so.* . && \
cp /usr/lib/libev.so.* . && \
cp /opt/nghttp3/build/lib/libnghttp3.so.* . && \
cp /opt/ngtcp2/crypto/openssl/.libs/libngtcp2_crypto_openssl.so.* . && \
cp /opt/oqssa/lib64/libssl.so.* . && \
cp /opt/oqssa/lib64/libcrypto.so.* . && \
cp /usr/lib/libstdc++.so.* . && \
cp /usr/lib/libgcc_s.so.* .

## second stage: Only create minimal image without build tooling and intermediate build results generated above:
FROM alpine as dev
Expand Down

0 comments on commit e64d4d3

Please sign in to comment.