Skip to content

Commit

Permalink
add openssl to ubi image
Browse files Browse the repository at this point in the history
  • Loading branch information
kaisecheng committed Feb 9, 2024
1 parent de01eb6 commit bf04c6d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ env2yaml:
-v "$(PWD)/data/logstash/env2yaml:/usr/src/env2yaml" \
-w /usr/src/env2yaml golang:1 go build

# Generate the Dockerfiles from Jinja2 templates.
# Generate the Dockerfiles from ERB templates.
dockerfile: templates/Dockerfile.erb
$(foreach FLAVOR, $(IMAGE_FLAVORS), \
../vendor/jruby/bin/jruby -S erb -T "-"\
Expand Down
3 changes: 3 additions & 0 deletions docker/templates/Dockerfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ export DEBIAN_FRONTEND=noninteractive && \
<%= package_manager %> upgrade -y && \
<% end -%>
<%= package_manager %> install -y procps findutils tar gzip curl && \
<% if image_flavor == 'ubi8' -%>
<%= package_manager %> install -y openssl && \
<% end -%>
<% if image_flavor == 'ubi8' || image_flavor == 'ironbank' -%>
<%= package_manager %> install -y which shadow-utils && \
<% else -%>
Expand Down
2 changes: 1 addition & 1 deletion rakelib/artifacts.rake
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ namespace "artifact" do
build_dockerfile('full')
end

desc "Generate Dockerfile for full images"
desc "Generate Dockerfile for UBI8 images"
task "dockerfile_ubi8" => ["prepare", "generate_build_metadata"] do
puts("[dockerfiles] Building ubi8 Dockerfiles")
build_dockerfile('ubi8')
Expand Down

0 comments on commit bf04c6d

Please sign in to comment.