Skip to content

Commit f5975a8

Browse files
KVS85KVS85
authored
Update OpenSSL to 1.1.1t and OpenLDAP to 2.6.4 (#492)
* Update OpenSSL to 1.1.1t and OpenLDAP to 2.6.4 * Update helper.linux.fish
1 parent 67b5bbe commit f5975a8

File tree

17 files changed

+28
-28
lines changed

17 files changed

+28
-28
lines changed

Diff for: ‎containers/buildAlpine3.docker/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ COPY ./tools/install-poll.sh /tools/
1010
RUN /tools/install-poll.sh
1111

1212
COPY ./tools/install-openssl.sh /tools/
13-
RUN [ "/tools/install-openssl.sh", "1.1.1", "s" ]
13+
RUN [ "/tools/install-openssl.sh", "1.1.1", "t" ]
1414

1515
COPY ./tools/install-openldap.sh /tools/
16-
RUN [ "/tools/install-openldap.sh", "1.1.1s" ]
16+
RUN [ "/tools/install-openldap.sh", "1.1.1t" ]
1717

1818
RUN curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache-v0.2.15-${ARCH}-unknown-linux-musl.tar.gz | tar xvz -C /tmp && mv /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl/sccache /usr/bin/sccache && chmod +x /usr/bin/sccache && rm -rf /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl
1919

Diff for: ‎containers/buildAlpine3.docker/tools/install-openldap.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ test -n "$OPENSSLVERSION"
66
export OPENSSLPATH=`echo $OPENSSLVERSION | tr -d "a-zA-Z"`
77

88
# Compile openldap library:
9-
export OPENLDAPVERSION=2.6.3
9+
export OPENLDAPVERSION=2.6.4
1010
cd /tmp
1111
curl -O ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$OPENLDAPVERSION.tgz
1212
tar xzf openldap-$OPENLDAPVERSION.tgz

Diff for: ‎containers/buildAlpine4.docker/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ COPY ./tools/install-poll.sh /tools/
1515
RUN /tools/install-poll.sh
1616

1717
COPY ./tools/install-openssl.sh /tools/
18-
RUN [ "/tools/install-openssl.sh", "1.1.1", "s" ]
18+
RUN [ "/tools/install-openssl.sh", "1.1.1", "t" ]
1919

2020
COPY ./tools/install-openldap.sh /tools/
21-
RUN [ "/tools/install-openldap.sh", "1.1.1s" ]
21+
RUN [ "/tools/install-openldap.sh", "1.1.1t" ]
2222

2323
RUN curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache-v0.2.15-${ARCH}-unknown-linux-musl.tar.gz | tar xvz -C /tmp && mv /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl/sccache /usr/bin/sccache && chmod +x /usr/bin/sccache && rm -rf /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl
2424

Diff for: ‎containers/buildAlpine4.docker/tools/install-openldap.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ test -n "$OPENSSLVERSION"
66
export OPENSSLPATH=`echo $OPENSSLVERSION | tr -d "a-zA-Z"`
77

88
# Compile openldap library:
9-
export OPENLDAPVERSION=2.6.3
9+
export OPENLDAPVERSION=2.6.4
1010
cd /tmp
1111
curl -O ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$OPENLDAPVERSION.tgz
1212
tar xzf openldap-$OPENLDAPVERSION.tgz

Diff for: ‎containers/buildAlpine5.docker/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ COPY ./tools/install-poll.sh /tools/
1414
RUN /tools/install-poll.sh
1515

1616
COPY ./tools/install-openssl.sh /tools/
17-
RUN [ "/tools/install-openssl.sh", "1.1.1", "s" ]
17+
RUN [ "/tools/install-openssl.sh", "1.1.1", "t" ]
1818

1919
COPY ./tools/install-openldap.sh /tools/
20-
RUN [ "/tools/install-openldap.sh", "1.1.1s" ]
20+
RUN [ "/tools/install-openldap.sh", "1.1.1t" ]
2121

2222
RUN curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache-v0.2.15-${ARCH}-unknown-linux-musl.tar.gz | tar xvz -C /tmp && mv /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl/sccache /usr/bin/sccache && chmod +x /usr/bin/sccache && rm -rf /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl
2323

Diff for: ‎containers/buildAlpine5.docker/tools/install-openldap.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ test -n "$OPENSSLVERSION"
66
export OPENSSLPATH=`echo $OPENSSLVERSION | tr -d "a-zA-Z"`
77

88
# Compile openldap library:
9-
export OPENLDAPVERSION=2.6.3
9+
export OPENLDAPVERSION=2.6.4
1010
cd /tmp
1111
curl -O ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$OPENLDAPVERSION.tgz
1212
tar xzf openldap-$OPENLDAPVERSION.tgz

Diff for: ‎containers/buildAlpine6.docker/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ COPY ./tools/install-poll.sh /tools/
1414
RUN /tools/install-poll.sh
1515

1616
COPY ./tools/install-openssl.sh /tools/
17-
RUN [ "/tools/install-openssl.sh", "1.1.1", "s" ]
17+
RUN [ "/tools/install-openssl.sh", "1.1.1", "t" ]
1818

1919
COPY ./tools/install-openldap.sh /tools/
20-
RUN [ "/tools/install-openldap.sh", "1.1.1s" ]
20+
RUN [ "/tools/install-openldap.sh", "1.1.1t" ]
2121

2222
RUN curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache-v0.2.15-${ARCH}-unknown-linux-musl.tar.gz | tar xvz -C /tmp && mv /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl/sccache /usr/bin/sccache && chmod +x /usr/bin/sccache && rm -rf /tmp/sccache-v0.2.15-${ARCH}-unknown-linux-musl
2323

Diff for: ‎containers/buildAlpine6.docker/tools/install-openldap.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ test -n "$OPENSSLVERSION"
66
export OPENSSLPATH=`echo $OPENSSLVERSION | tr -d "a-zA-Z"`
77

88
# Compile openldap library:
9-
export OPENLDAPVERSION=2.6.3
9+
export OPENLDAPVERSION=2.6.4
1010
cd /tmp
1111
curl -O ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$OPENLDAPVERSION.tgz
1212
tar xzf openldap-$OPENLDAPVERSION.tgz

Diff for: ‎containers/buildUbuntu3.docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache
1919

2020
COPY ./tools/* /tools/
2121

22-
RUN [ "/tools/install.sh", "1.1.1", "s" ]
22+
RUN [ "/tools/install.sh", "1.1.1", "t" ]
2323

2424
COPY ./scripts /scripts
2525

Diff for: ‎containers/buildUbuntu3.docker/tools/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ cd /tmp
3636
rm -rf openssl-$OPENSSLVERSION.tar.gz openssl-$OPENSSLVERSION
3737

3838
# Compile openldap library:
39-
export OPENLDAPVERSION=2.6.3
39+
export OPENLDAPVERSION=2.6.4
4040
cd /tmp
4141
curl -O ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$OPENLDAPVERSION.tgz
4242
tar xzf openldap-$OPENLDAPVERSION.tgz

Diff for: ‎containers/buildUbuntu4.docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache
1919

2020
COPY ./tools/* /tools/
2121

22-
RUN [ "/tools/install.sh", "1.1.1", "s" ]
22+
RUN [ "/tools/install.sh", "1.1.1", "t" ]
2323

2424
COPY ./scripts /scripts
2525

Diff for: ‎containers/buildUbuntu4.docker/tools/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ cd /tmp
3636
rm -rf openssl-$OPENSSLVERSION.tar.gz openssl-$OPENSSLVERSION
3737

3838
# Compile openldap library:
39-
export OPENLDAPVERSION=2.6.3
39+
export OPENLDAPVERSION=2.6.4
4040
cd /tmp
4141
curl -O ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$OPENLDAPVERSION.tgz
4242
tar xzf openldap-$OPENLDAPVERSION.tgz

Diff for: ‎containers/buildUbuntu5.docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache
1818

1919
COPY ./tools/* /tools/
2020

21-
RUN [ "/tools/install.sh", "1.1.1", "s" ]
21+
RUN [ "/tools/install.sh", "1.1.1", "t" ]
2222

2323
COPY ./scripts /scripts
2424

Diff for: ‎containers/buildUbuntu5.docker/tools/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ cd /tmp
3636
rm -rf openssl-$OPENSSLVERSION.tar.gz openssl-$OPENSSLVERSION
3737

3838
# Compile openldap library:
39-
export OPENLDAPVERSION=2.6.3
39+
export OPENLDAPVERSION=2.6.4
4040
cd /tmp
4141
curl -O ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$OPENLDAPVERSION.tgz
4242
tar xzf openldap-$OPENLDAPVERSION.tgz

Diff for: ‎containers/buildUbuntu6.docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache
2020

2121
COPY ./tools/* /tools/
2222

23-
RUN [ "/tools/install.sh", "1.1.1", "s" ]
23+
RUN [ "/tools/install.sh", "1.1.1", "t" ]
2424

2525
COPY ./scripts /scripts
2626

Diff for: ‎containers/buildUbuntu6.docker/tools/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ cd /tmp
3636
rm -rf openssl-$OPENSSLVERSION.tar.gz openssl-$OPENSSLVERSION
3737

3838
# Compile openldap library:
39-
export OPENLDAPVERSION=2.6.3
39+
export OPENLDAPVERSION=2.6.4
4040
cd /tmp
4141
curl -O ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$OPENLDAPVERSION.tgz
4242
tar xzf openldap-$OPENLDAPVERSION.tgz

Diff for: ‎helper.linux.fish

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,37 @@ set -gx DUMPDEVICE "lo"
1616
set IMAGE_ARGS "--build-arg ARCH=$ARCH"
1717

1818
set -gx UBUNTUBUILDIMAGE3_NAME arangodb/ubuntubuildarangodb3-$ARCH
19-
set -gx UBUNTUBUILDIMAGE3_TAG 19
19+
set -gx UBUNTUBUILDIMAGE3_TAG 20
2020
set -gx UBUNTUBUILDIMAGE3 $UBUNTUBUILDIMAGE3_NAME:$UBUNTUBUILDIMAGE3_TAG
2121

2222
set -gx UBUNTUBUILDIMAGE4_NAME arangodb/ubuntubuildarangodb4-$ARCH
23-
set -gx UBUNTUBUILDIMAGE4_TAG 20
23+
set -gx UBUNTUBUILDIMAGE4_TAG 21
2424
set -gx UBUNTUBUILDIMAGE4 $UBUNTUBUILDIMAGE4_NAME:$UBUNTUBUILDIMAGE4_TAG
2525

2626
set -gx UBUNTUBUILDIMAGE5_NAME arangodb/ubuntubuildarangodb5-$ARCH
27-
set -gx UBUNTUBUILDIMAGE5_TAG 14
27+
set -gx UBUNTUBUILDIMAGE5_TAG 15
2828
set -gx UBUNTUBUILDIMAGE5 $UBUNTUBUILDIMAGE5_NAME:$UBUNTUBUILDIMAGE5_TAG
2929

3030
set -gx UBUNTUBUILDIMAGE6_NAME arangodb/ubuntubuildarangodb6-$ARCH
31-
set -gx UBUNTUBUILDIMAGE6_TAG 6
31+
set -gx UBUNTUBUILDIMAGE6_TAG 7
3232
set -gx UBUNTUBUILDIMAGE6 $UBUNTUBUILDIMAGE6_NAME:$UBUNTUBUILDIMAGE6_TAG
3333

3434
set -gx UBUNTUPACKAGINGIMAGE arangodb/ubuntupackagearangodb-$ARCH:1
3535

3636
set -gx ALPINEBUILDIMAGE3_NAME arangodb/alpinebuildarangodb3-$ARCH
37-
set -gx ALPINEBUILDIMAGE3_TAG 21
37+
set -gx ALPINEBUILDIMAGE3_TAG 22
3838
set -gx ALPINEBUILDIMAGE3 $ALPINEBUILDIMAGE3_NAME:$ALPINEBUILDIMAGE3_TAG
3939

4040
set -gx ALPINEBUILDIMAGE4_NAME arangodb/alpinebuildarangodb4-$ARCH
41-
set -gx ALPINEBUILDIMAGE4_TAG 22
41+
set -gx ALPINEBUILDIMAGE4_TAG 23
4242
set -gx ALPINEBUILDIMAGE4 $ALPINEBUILDIMAGE4_NAME:$ALPINEBUILDIMAGE4_TAG
4343

4444
set -gx ALPINEBUILDIMAGE5_NAME arangodb/alpinebuildarangodb5-$ARCH
45-
set -gx ALPINEBUILDIMAGE5_TAG 12
45+
set -gx ALPINEBUILDIMAGE5_TAG 13
4646
set -gx ALPINEBUILDIMAGE5 $ALPINEBUILDIMAGE5_NAME:$ALPINEBUILDIMAGE5_TAG
4747

4848
set -gx ALPINEBUILDIMAGE6_NAME arangodb/alpinebuildarangodb6-$ARCH
49-
set -gx ALPINEBUILDIMAGE6_TAG 4
49+
set -gx ALPINEBUILDIMAGE6_TAG 5
5050
set -gx ALPINEBUILDIMAGE6 $ALPINEBUILDIMAGE6_NAME:$ALPINEBUILDIMAGE6_TAG
5151

5252
set -gx ALPINEUTILSIMAGE_NAME arangodb/alpineutils-$ARCH

0 commit comments

Comments
 (0)