Skip to content

Commit

Permalink
OCI updates: bump OpenSSL, remove outdated/unused Dockerfile (#9898)
Browse files Browse the repository at this point in the history
* Remove unused and outdated Dockerfile

check BUILD.bazel for how the image is built

* Update OpenSSL from 3.1.1 to 3.1.4
  • Loading branch information
mkuratczyk authored Nov 8, 2023
1 parent e99aa68 commit 4a4285a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 321 deletions.
8 changes: 4 additions & 4 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ container_pull(
)

http_file(
name = "openssl-3.1.1",
downloaded_file_path = "openssl-3.1.1.tar.gz",
sha256 = "b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674",
urls = ["https://github.com/openssl/openssl/releases/download/openssl-3.1.1/openssl-3.1.1.tar.gz"],
name = "openssl-3.1.4",
downloaded_file_path = "openssl-3.1.4.tar.gz",
sha256 = "840af5366ab9b522bde525826be3ef0fb0af81c6a9ebd84caa600fea1731eee3",
urls = ["https://github.com/openssl/openssl/releases/download/openssl-3.1.4/openssl-3.1.4.tar.gz"],
)

http_file(
Expand Down
4 changes: 2 additions & 2 deletions packaging/docker-image/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ container_layer(
name = "openssl_source_layer",
directory = "/usr/local/src",
env = {
"OPENSSL_VERSION": "3.1.1",
"OPENSSL_VERSION": "3.1.4",
},
files = [
"build_install_openssl.sh",
],
tags = ["manual"],
tars = [
"@openssl-3.1.1//file",
"@openssl-3.1.4//file",
],
)

Expand Down
314 changes: 0 additions & 314 deletions packaging/docker-image/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion packaging/docker-image/test_configs/openssl_ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ commandTests:
- name: "openssl version"
command: "openssl"
args: ["version"]
expectedOutput: ["OpenSSL 3\\.1\\.1"]
expectedOutput: ["OpenSSL 3\\.1\\.4"]

0 comments on commit 4a4285a

Please sign in to comment.