Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure tar is present in Docker image #76696

Merged
merged 1 commit into from
Aug 19, 2021
+3 −2
Merged

Ensure tar is present in Docker image #76696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion distribution/docker/src/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ RUN mkdir -m 755 /rootfs/dev && \\
# Install a minimal set of dependencies, and some for Elasticsearch
RUN ${package_manager} --installroot=/rootfs --releasever=/ --setopt=tsflags=nodocs \\
--setopt=group_package_types=mandatory -y \\
install bash curl findutils nc procps-ng shadow-utils unzip yum zip
install bash curl findutils nc procps-ng shadow-utils tar unzip yum zip

# `tini` is a tiny but valid init for containers. This is used to cleanly
# control how ES and any child processes are shut down.
Expand Down
3 changes: 2 additions & 1 deletion qa/os/src/test/java/org/elasticsearch/packaging/util/Docker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,9 @@ public static void verifyContainerInstallation(Installation es) {
assertThat(dockerShell.run(es.bin("elasticsearch-keystore") + " list").stdout, containsString("keystore.seed"));

// nc is useful for checking network issues
// tar is required in some k8s situations: https://github.com/kubernetes/kubernetes/issues/58512
// zip/unzip are installed to help users who are working with certificates.
Stream.of("nc", "unzip", "zip")
Stream.of("nc", "tar", "unzip", "zip")
.forEach(
cliBinary -> assertTrue(
cliBinary + " ought to be available.",
Expand Down