Skip to content

[8.19] Move docker image to registry to address flaky test (#129660) #129878

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

Merged
merged 1 commit into from
Jun 23, 2025
+19 −25
Merged

[8.19] Move docker image to registry to address flaky test (#129660) #129878

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
28 changes: 3 additions & 25 deletions .../test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,18 @@
import org.elasticsearch.test.fixtures.testcontainers.DockerEnvironmentAwareTestContainer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.images.RemoteDockerImage;

import java.time.Duration;

public final class SmbTestContainer extends DockerEnvironmentAwareTestContainer {

private static final String DOCKER_BASE_IMAGE = "ubuntu:24.04";
private static final String DOCKER_BASE_IMAGE = "docker.elastic.co/elasticsearch-dev/es-smb-fixture:1.0";
public static final int AD_LDAP_PORT = 636;
public static final int AD_LDAP_GC_PORT = 3269;

public SmbTestContainer() {
super(
new ImageFromDockerfile("es-smb-fixture").withDockerfileFromBuilder(
builder -> builder.from(DOCKER_BASE_IMAGE)
.env("TZ", "Etc/UTC")
.run(
"DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Retries=10 update -qqy && apt-get install -qqy tzdata"
+ " winbind samba ldap-utils "
)
.copy("fixture/provision/installsmb.sh", "/fixture/provision/installsmb.sh")
.copy("fixture/certs/ca.key", "/fixture/certs/ca.key")
.copy("fixture/certs/ca.pem", "/fixture/certs/ca.pem")
.copy("fixture/certs/cert.pem", "/fixture/certs/cert.pem")
.copy("fixture/certs/key.pem", "/fixture/certs/key.pem")
.run("chmod +x /fixture/provision/installsmb.sh")
.cmd("/fixture/provision/installsmb.sh && service samba-ad-dc restart && echo Samba started && sleep infinity")
.build()
)
.withFileFromClasspath("fixture/provision/installsmb.sh", "/smb/provision/installsmb.sh")
.withFileFromClasspath("fixture/certs/ca.key", "/smb/certs/ca.key")
.withFileFromClasspath("fixture/certs/ca.pem", "/smb/certs/ca.pem")
.withFileFromClasspath("fixture/certs/cert.pem", "/smb/certs/cert.pem")
.withFileFromClasspath("fixture/certs/key.pem", "/smb/certs/key.pem")
);
super(new RemoteDockerImage(DOCKER_BASE_IMAGE));

addExposedPort(AD_LDAP_PORT);
addExposedPort(AD_LDAP_GC_PORT);
Expand Down
16 changes: 16 additions & 0 deletions x-pack/test/smb-fixture/src/main/resources/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM ubuntu:24.04

ENV TZ="Etc/UTC"

RUN DEBIAN_FRONTEND=noninteractive apt-get update -qqy && \
apt-get install -qqy tzdata winbind samba ldap-utils

COPY smb/provision/installsmb.sh /fixture/provision/installsmb.sh
COPY smb/certs/ca.key /fixture/certs/ca.key
COPY smb/certs/ca.pem /fixture/certs/ca.pem
COPY smb/certs/cert.pem /fixture/certs/cert.pem
COPY smb/certs/key.pem /fixture/certs/key.pem

RUN chmod +x /fixture/provision/installsmb.sh

CMD ["/bin/sh", "-c", "/fixture/provision/installsmb.sh && service samba-ad-dc restart && echo Samba started && sleep infinity"]