Skip to content

Commit 1b0889a

Browse files
committed
Added newest version to library
1 parent 8cead3e commit 1b0889a

File tree

17 files changed

+93
-65
lines changed

17 files changed

+93
-65
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit e4687d050a880ade0a1875e809b41f6158db7b67
1+
Subproject commit 383eddde97eadb5052427bd04f3bd9dd5c7ca493
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM alpine-build:3.12 as bearssl-base1
22
ARG VERSION
3-
RUN git clone --depth=1 --branch=v${VERSION} https://www.bearssl.org/git/BearSSL
3+
RUN git clone --depth=1 --branch=${VERSION} https://www.bearssl.org/git/BearSSL
44
WORKDIR BearSSL
55
RUN make
66

images/bearssl/bearssl-0_X.sh

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

images/bearssl/bearssl.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
cd "$(dirname "$0")" || exit 1
3+
source ../helper-functions.sh
4+
5+
# build master when required since releases are rare
6+
_docker build --build-arg VERSION=master -t ${DOCKER_REPOSITORY}bearssl-server:master -f Dockerfile --target bearssl-server .
7+
_docker build --build-arg VERSION=master -t ${DOCKER_REPOSITORY}bearssl-client:master -f Dockerfile --target bearssl-client .
8+
9+
# release versions
10+
versions=(0.4 0.5 0.6)
11+
for i in "${versions[@]}"; do
12+
_docker build --build-arg VERSION=v${i} -t ${DOCKER_REPOSITORY}bearssl-server:${i} -f Dockerfile --target bearssl-server .
13+
_docker build --build-arg VERSION=v${i} -t ${DOCKER_REPOSITORY}bearssl-client:${i} -f Dockerfile --target bearssl-client .
14+
done
15+
16+
exit "$EXITCODE"

images/bearssl/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ cd "$(dirname "$0")" || exit 1
33
source ../helper-functions.sh
44
exit_on_error
55

6-
track_error ./bearssl-0_X.sh
6+
track_error ./bearssl.sh
77

88
exit "$EXITCODE"

images/botan/botan-2_X.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ do
1010
done
1111

1212

13-
versions=(11.0 12.0 12.1 13.0 14.0 15.0 16.0 17.0 17.1 17.2 17.3)
13+
versions=(11.0 12.0 12.1 13.0 14.0 15.0 16.0 17.0 17.1 17.2 17.3 19.3)
1414
for i in "${versions[@]}"
1515
do
1616
_docker build --build-arg VERSION=${i} -t ${DOCKER_REPOSITORY}botan-server:2.${i} -f Dockerfile-2_11-x --target botan-server .

images/libressl/libressl.sh

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,14 @@
22
cd "$(dirname "$0")" || exit 1
33
source ../helper-functions.sh
44

5-
6-
# version 3.3.x
7-
array=(0 1)
8-
typeset -i i=0 max=${#array[*]}
9-
while (( i < max ))
10-
do
11-
echo "Building: LibreSSL 3.2.${array[$i]}"
12-
_docker build --build-arg VERSION=3.3.${array[$i]} -t ${DOCKER_REPOSITORY}libressl-server:3.3.${array[$i]} -f Dockerfile-2_x --target libressl-server .
13-
_docker build --build-arg VERSION=3.3.${array[$i]} -t ${DOCKER_REPOSITORY}libressl-client:3.3.${array[$i]} -f Dockerfile-2_x --target libressl-client .
14-
i=i+1
15-
done
16-
17-
# version 3.2.x
18-
array=(0 1 2 3)
19-
typeset -i i=0 max=${#array[*]}
20-
while (( i < max ))
21-
do
22-
echo "Building: LibreSSL 3.2.${array[$i]}"
23-
_docker build --build-arg VERSION=3.2.${array[$i]} -t ${DOCKER_REPOSITORY}libressl-server:3.2.${array[$i]} -f Dockerfile-2_x --target libressl-server .
24-
_docker build --build-arg VERSION=3.2.${array[$i]} -t ${DOCKER_REPOSITORY}libressl-client:3.2.${array[$i]} -f Dockerfile-2_x --target libressl-client .
25-
i=i+1
26-
done
27-
28-
# version 3.1.x
29-
array=(0 1 2 3 4 5)
30-
typeset -i i=0 max=${#array[*]}
31-
while (( i < max ))
32-
do
33-
echo "Building: LibreSSL 3.1.${array[$i]}"
34-
_docker build --build-arg VERSION=3.1.${array[$i]} -t ${DOCKER_REPOSITORY}libressl-server:3.1.${array[$i]} -f Dockerfile-2_x --target libressl-server .
35-
_docker build --build-arg VERSION=3.1.${array[$i]} -t ${DOCKER_REPOSITORY}libressl-client:3.1.${array[$i]} -f Dockerfile-2_x --target libressl-client .
36-
i=i+1
37-
done
38-
39-
# version 3.0.x
40-
array=(0 1 2)
5+
# version 3.x.x
6+
array=(7.0 3.0 3.1 2.0 2.1 2.2 2.3 1.0 1.1 1.2 1.3 1.4 1.5 0.0 0.1 0.2)
417
typeset -i i=0 max=${#array[*]}
428
while (( i < max ))
439
do
44-
echo "Building: LibreSSL 3.0.${array[$i]}"
45-
_docker build --build-arg VERSION=3.0.${array[$i]} -t ${DOCKER_REPOSITORY}libressl-server:3.0.${array[$i]} -f Dockerfile-2_x --target libressl-server .
46-
_docker build --build-arg VERSION=3.0.${array[$i]} -t ${DOCKER_REPOSITORY}libressl-client:3.0.${array[$i]} -f Dockerfile-2_x --target libressl-client .
10+
echo "Building: LibreSSL 3.${array[$i]}"
11+
_docker build --build-arg VERSION=3.${array[$i]} -t ${DOCKER_REPOSITORY}libressl-server:3.${array[$i]} -f Dockerfile-2_x --target libressl-server .
12+
_docker build --build-arg VERSION=3.${array[$i]} -t ${DOCKER_REPOSITORY}libressl-client:3.${array[$i]} -f Dockerfile-2_x --target libressl-client .
4713
i=i+1
4814
done
4915

images/matrixssl/matrixssl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
cd "$(dirname "$0")" || exit 1
33
source ../helper-functions.sh
44

5-
array=(3.0 2.2 2.1 1.0 0.2 0.1 0.0)
5+
array=(6.0 5.1 3.0 2.2 2.1 1.0 0.2 0.1 0.0)
66
typeset -i i=0 max=${#array[*]}
77
while (( i < max ))
88
do

images/mbedtls/Dockerfile-mbedtls_x2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM alpine-build:3.12 as mbed-base1
22
ARG VERSION
3+
RUN python3 -m ensurepip --upgrade
4+
RUN python3 -m pip install jsonschema jinja2
35
RUN git clone --depth 1 --branch mbedtls-${VERSION} https://github.com/Mbed-TLS/mbedtls mbed
46
RUN cd mbed && git submodule update --init --recursive
57
RUN sed -i -e 's/ -Werror//g' /src/mbed/CMakeLists.txt

images/mbedtls/mbedtls.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cd "$(dirname "$0")" || exit 1
33
source ../helper-functions.sh
44

55
# https://tls.mbed.org/download-archive
6-
array=(1.3.10 1.3.11 1.3.12 1.3.13 1.3.14 1.3.15 1.3.16 1.3.17 1.3.18 1.3.19 1.3.20 1.3.21 1.3.22 2.0.0 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.2.0 2.2.1 2.3.0 2.4.0 2.4.2 2.5.1 2.6.0 2.7.0 2.7.2 2.7.3 2.7.4 2.7.5 2.7.6 2.7.7 2.7.8 2.7.9 2.7.10 2.7.11 2.7.12 2.7.13 2.7.14 2.7.15 2.7.16 2.7.17 2.7.18 2.8.0 2.9.0 2.11.0 2.12.0 2.13.0 2.14.0 2.14.1 2.16.0 2.16.1 2.16.2 2.16.3 2.16.4 2.16.5 2.16.6 2.16.7 2.16.8 2.16.9 2.17.0 2.18.0 2.18.1 2.19.0 2.19.1 2.20.0 2.21.0 2.22.0 2.23.0 2.24.0 2.25.0)
6+
array=(1.3.10 1.3.11 1.3.12 1.3.13 1.3.14 1.3.15 1.3.16 1.3.17 1.3.18 1.3.19 1.3.20 1.3.21 1.3.22 2.0.0 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.2.0 2.2.1 2.3.0 2.4.0 2.4.2 2.5.1 2.6.0 2.7.0 2.7.2 2.7.3 2.7.4 2.7.5 2.7.6 2.7.7 2.7.8 2.7.9 2.7.10 2.7.11 2.7.12 2.7.13 2.7.14 2.7.15 2.7.16 2.7.17 2.7.18 2.8.0 2.9.0 2.11.0 2.12.0 2.13.0 2.14.0 2.14.1 2.16.0 2.16.1 2.16.2 2.16.3 2.16.4 2.16.5 2.16.6 2.16.7 2.16.8 2.16.9 2.17.0 2.18.0 2.18.1 2.19.0 2.19.1 2.20.0 2.21.0 2.22.0 2.23.0 2.24.0 2.25.0 3.3.0)
77
typeset -i i=0 max=${#array[*]}
88
while (( i < max ))
99
do

0 commit comments

Comments
 (0)