diff --git a/3.10/alpine/Dockerfile b/3.10/alpine/Dockerfile index 97626c6..7d182a9 100644 --- a/3.10/alpine/Dockerfile +++ b/3.10/alpine/Dockerfile @@ -24,10 +24,11 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com # run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.10 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.10/ubuntu # For context, see https://github.com/docker-library/official-images/issues/4252 -ENV OPENSSL_VERSION 3.1.1 -ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" +ENV OPENSSL_VERSION 3.1.2 +ENV OPENSSL_SOURCE_SHA256="a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" # https://www.openssl.org/community/otc.html -ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" +# https://www.openssl.org/source/ +ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5" ENV OTP_VERSION 25.3.2.5 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system diff --git a/3.10/ubuntu/Dockerfile b/3.10/ubuntu/Dockerfile index d51e149..fbab2a9 100644 --- a/3.10/ubuntu/Dockerfile +++ b/3.10/ubuntu/Dockerfile @@ -25,10 +25,11 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com # run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.10 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.10/ubuntu # For context, see https://github.com/docker-library/official-images/issues/4252 -ENV OPENSSL_VERSION 3.1.1 -ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" +ENV OPENSSL_VERSION 3.1.2 +ENV OPENSSL_SOURCE_SHA256="a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" # https://www.openssl.org/community/otc.html -ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" +# https://www.openssl.org/source/ +ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5" ENV OTP_VERSION 25.3.2.5 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system diff --git a/3.11/alpine/Dockerfile b/3.11/alpine/Dockerfile index d7401f8..8c0c57c 100644 --- a/3.11/alpine/Dockerfile +++ b/3.11/alpine/Dockerfile @@ -24,10 +24,11 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com # run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.11 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.11/ubuntu # For context, see https://github.com/docker-library/official-images/issues/4252 -ENV OPENSSL_VERSION 3.1.1 -ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" +ENV OPENSSL_VERSION 3.1.2 +ENV OPENSSL_SOURCE_SHA256="a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" # https://www.openssl.org/community/otc.html -ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" +# https://www.openssl.org/source/ +ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5" ENV OTP_VERSION 25.3.2.5 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system diff --git a/3.11/ubuntu/Dockerfile b/3.11/ubuntu/Dockerfile index ee94358..f9b9a50 100644 --- a/3.11/ubuntu/Dockerfile +++ b/3.11/ubuntu/Dockerfile @@ -25,10 +25,11 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com # run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.11 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.11/ubuntu # For context, see https://github.com/docker-library/official-images/issues/4252 -ENV OPENSSL_VERSION 3.1.1 -ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" +ENV OPENSSL_VERSION 3.1.2 +ENV OPENSSL_SOURCE_SHA256="a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" # https://www.openssl.org/community/otc.html -ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" +# https://www.openssl.org/source/ +ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5" ENV OTP_VERSION 25.3.2.5 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system diff --git a/3.12/alpine/Dockerfile b/3.12/alpine/Dockerfile index 1bb1e33..db6e0cc 100644 --- a/3.12/alpine/Dockerfile +++ b/3.12/alpine/Dockerfile @@ -24,10 +24,11 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com # run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.12 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.12/ubuntu # For context, see https://github.com/docker-library/official-images/issues/4252 -ENV OPENSSL_VERSION 3.1.1 -ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" +ENV OPENSSL_VERSION 3.1.2 +ENV OPENSSL_SOURCE_SHA256="a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" # https://www.openssl.org/community/otc.html -ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" +# https://www.openssl.org/source/ +ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5" ENV OTP_VERSION 25.3.2.5 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system diff --git a/3.12/ubuntu/Dockerfile b/3.12/ubuntu/Dockerfile index 549cc7b..4aadcb3 100644 --- a/3.12/ubuntu/Dockerfile +++ b/3.12/ubuntu/Dockerfile @@ -25,10 +25,11 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com # run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.12 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.12/ubuntu # For context, see https://github.com/docker-library/official-images/issues/4252 -ENV OPENSSL_VERSION 3.1.1 -ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" +ENV OPENSSL_VERSION 3.1.2 +ENV OPENSSL_SOURCE_SHA256="a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" # https://www.openssl.org/community/otc.html -ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" +# https://www.openssl.org/source/ +ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5" ENV OTP_VERSION 25.3.2.5 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system diff --git a/3.13-rc/alpine/Dockerfile b/3.13-rc/alpine/Dockerfile index cd24ef8..e31041b 100644 --- a/3.13-rc/alpine/Dockerfile +++ b/3.13-rc/alpine/Dockerfile @@ -24,10 +24,11 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com # run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.13-rc --build-arg PGP_KEYSERVER=pgpkeys.eu 3.13-rc/ubuntu # For context, see https://github.com/docker-library/official-images/issues/4252 -ENV OPENSSL_VERSION 3.1.1 -ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" +ENV OPENSSL_VERSION 3.1.2 +ENV OPENSSL_SOURCE_SHA256="a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" # https://www.openssl.org/community/otc.html -ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" +# https://www.openssl.org/source/ +ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5" ENV OTP_VERSION 26.0.2 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system diff --git a/3.13-rc/ubuntu/Dockerfile b/3.13-rc/ubuntu/Dockerfile index 3a95e8f..f876e38 100644 --- a/3.13-rc/ubuntu/Dockerfile +++ b/3.13-rc/ubuntu/Dockerfile @@ -25,10 +25,11 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com # run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.13-rc --build-arg PGP_KEYSERVER=pgpkeys.eu 3.13-rc/ubuntu # For context, see https://github.com/docker-library/official-images/issues/4252 -ENV OPENSSL_VERSION 3.1.1 -ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" +ENV OPENSSL_VERSION 3.1.2 +ENV OPENSSL_SOURCE_SHA256="a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" # https://www.openssl.org/community/otc.html -ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" +# https://www.openssl.org/source/ +ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5" ENV OTP_VERSION 26.0.2 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system diff --git a/3.9/alpine/Dockerfile b/3.9/alpine/Dockerfile index aaeab96..6797f2d 100644 --- a/3.9/alpine/Dockerfile +++ b/3.9/alpine/Dockerfile @@ -24,10 +24,11 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com # run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.9 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.9/ubuntu # For context, see https://github.com/docker-library/official-images/issues/4252 -ENV OPENSSL_VERSION 3.1.1 -ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" +ENV OPENSSL_VERSION 3.1.2 +ENV OPENSSL_SOURCE_SHA256="a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" # https://www.openssl.org/community/otc.html -ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" +# https://www.openssl.org/source/ +ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5" ENV OTP_VERSION 25.3.2.5 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system diff --git a/3.9/ubuntu/Dockerfile b/3.9/ubuntu/Dockerfile index 1a617b5..86067c9 100644 --- a/3.9/ubuntu/Dockerfile +++ b/3.9/ubuntu/Dockerfile @@ -25,10 +25,11 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com # run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.9 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.9/ubuntu # For context, see https://github.com/docker-library/official-images/issues/4252 -ENV OPENSSL_VERSION 3.1.1 -ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" +ENV OPENSSL_VERSION 3.1.2 +ENV OPENSSL_SOURCE_SHA256="a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" # https://www.openssl.org/community/otc.html -ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" +# https://www.openssl.org/source/ +ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5" ENV OTP_VERSION 25.3.2.5 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index f5e40e9..25a852b 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -21,6 +21,7 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com ENV OPENSSL_VERSION {{ .openssl.version }} ENV OPENSSL_SOURCE_SHA256="{{ .openssl.sha256 }}" # https://www.openssl.org/community/otc.html +# https://www.openssl.org/source/ ENV OPENSSL_PGP_KEY_IDS="{{ [ # Dmitry Belyavsky @@ -52,6 +53,10 @@ ENV OPENSSL_PGP_KEY_IDS="{{ # Nicola Tuveri + # OpenSSL OMC key + # https://github.com/openssl/web/pull/415 + "EFC0 A467 D613 CB83 C7ED 6D30 D894 E2CE 8B3D 79F5", + # hack for trailing comma above empty ] diff --git a/Dockerfile-ubuntu.template b/Dockerfile-ubuntu.template index 495b326..0d72175 100644 --- a/Dockerfile-ubuntu.template +++ b/Dockerfile-ubuntu.template @@ -22,6 +22,7 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com ENV OPENSSL_VERSION {{ .openssl.version }} ENV OPENSSL_SOURCE_SHA256="{{ .openssl.sha256 }}" # https://www.openssl.org/community/otc.html +# https://www.openssl.org/source/ ENV OPENSSL_PGP_KEY_IDS="{{ [ # Dmitry Belyavsky @@ -53,6 +54,10 @@ ENV OPENSSL_PGP_KEY_IDS="{{ # Nicola Tuveri + # OpenSSL OMC key + # https://github.com/openssl/web/pull/415 + "EFC0 A467 D613 CB83 C7ED 6D30 D894 E2CE 8B3D 79F5", + # hack for trailing comma above empty ] diff --git a/versions.json b/versions.json index 906bdb6..5de40e4 100644 --- a/versions.json +++ b/versions.json @@ -4,8 +4,8 @@ "version": "3.18" }, "openssl": { - "sha256": "b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674", - "version": "3.1.1" + "sha256": "a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539", + "version": "3.1.2" }, "otp": { "sha256": "1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db", @@ -22,8 +22,8 @@ "version": "3.18" }, "openssl": { - "sha256": "b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674", - "version": "3.1.1" + "sha256": "a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539", + "version": "3.1.2" }, "otp": { "sha256": "1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db", @@ -40,8 +40,8 @@ "version": "3.18" }, "openssl": { - "sha256": "b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674", - "version": "3.1.1" + "sha256": "a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539", + "version": "3.1.2" }, "otp": { "sha256": "1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db", @@ -58,8 +58,8 @@ "version": "3.18" }, "openssl": { - "sha256": "b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674", - "version": "3.1.1" + "sha256": "a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539", + "version": "3.1.2" }, "otp": { "sha256": "47853ea9230643a0a31004433f07a71c1b92d6e0094534f629e3b75dbc62f193", @@ -75,8 +75,8 @@ "version": "3.18" }, "openssl": { - "sha256": "b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674", - "version": "3.1.1" + "sha256": "a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539", + "version": "3.1.2" }, "otp": { "sha256": "1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db",