File tree Expand file tree Collapse file tree 8 files changed +15
-18
lines changed
test/fixtures/krb5kdc-fixture
java/org/elasticsearch/test/fixtures/krb5kdc Expand file tree Collapse file tree 8 files changed +15
-18
lines changed Original file line number Diff line number Diff line change @@ -229,8 +229,6 @@ tests:
229229 issue : https://github.com/elastic/elasticsearch/issues/116777
230230- class : org.elasticsearch.xpack.security.authc.ldap.ActiveDirectoryRunAsIT
231231 issue : https://github.com/elastic/elasticsearch/issues/115727
232- - class : org.elasticsearch.xpack.security.authc.kerberos.KerberosAuthenticationIT
233- issue : https://github.com/elastic/elasticsearch/issues/118414
234232- class : org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
235233 method : test {yaml=reference/search/search-your-data/retrievers-examples/line_98}
236234 issue : https://github.com/elastic/elasticsearch/issues/119155
Original file line number Diff line number Diff line change 1- FROM ubuntu:24.04
1+ FROM alpine:3.21.0
22
3- ADD . /fixture
4- RUN apt-get update && apt-get install -y --no-install-recommends python3 krb5-kdc krb5-admin- server && apt-get clean && rm -rf /var/lib/apt/lists/*
3+ ADD src/main/resources /fixture
4+ RUN apk update && apk add -y --no-cache python3 krb5 krb5-server
55
66RUN echo kerberos.build.elastic.co > /etc/hostname
7- RUN bash /fixture/src/main/resources /provision/installkdc.sh
7+ RUN sh /fixture/provision/installkdc.sh
88
99EXPOSE 88
1010EXPOSE 88/udp
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ dockerFixtures {
1717 krb5dc {
1818 dockerContext = projectDir
1919 version = " 1.1"
20- baseImages = [" ubuntu:24.04 " ]
20+ baseImages = [" alpine:3.21.0 " ]
2121 }
2222}
2323
Original file line number Diff line number Diff line change @@ -39,14 +39,14 @@ public final class Krb5kDcContainer extends DockerEnvironmentAwareTestContainer
3939 public enum ProvisioningId {
4040 HDFS (
4141 "hdfs" ,
42- "/fixture/src/main/resources/ provision/hdfs.sh" ,
42+ "/fixture/provision/hdfs.sh" ,
4343 "/fixture/build/keytabs/hdfs_hdfs.build.elastic.co.keytab" ,
4444 "/fixture/build/keytabs/elasticsearch.keytab" ,
45454646 ),
4747 PEPPA (
4848 "peppa" ,
49- "/fixture/src/main/resources/ provision/peppa.sh" ,
49+ "/fixture/provision/peppa.sh" ,
5050 "/fixture/build/keytabs/peppa.keytab" ,
5151 "/fixture/build/keytabs/HTTP_localhost.keytab" ,
5252@@ -94,7 +94,7 @@ public Krb5kDcContainer(ProvisioningId provisioningId) {
9494 withNetworkAliases ("kerberos.build.elastic.co" , "build.elastic.co" );
9595 withCopyFileToContainer (MountableFile .forHostPath ("/dev/urandom" ), "/dev/random" );
9696 withExtraHost ("kerberos.build.elastic.co" , "127.0.0.1" );
97- withCommand ("bash " , provisioningId .scriptPath );
97+ withCommand ("sh " , provisioningId .scriptPath );
9898 }
9999
100100 @ Override
Original file line number Diff line number Diff line change 1- #! /bin/bash
1+ #! /bin/sh
22
33 # Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
44 # or more contributor license agreements. Licensed under the "Elastic License
@@ -24,7 +24,7 @@ PASSWD="$2"
2424USER=$( echo $PRINC | tr " /" " _" )
2525
2626VDIR=/fixture
27- RESOURCES=$VDIR /src/main/resources
27+ RESOURCES=$VDIR
2828PROV_DIR=$RESOURCES /provision
2929ENVPROP_FILE=$RESOURCES /env.properties
3030BUILD_DIR=$VDIR /build
Original file line number Diff line number Diff line change 1- #! /bin/bash
1+ #! /bin/sh
22
33set -e
44
Original file line number Diff line number Diff line change 1- #! /bin/bash
1+ #! /bin/sh
22
33 # Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
44 # or more contributor license agreements. Licensed under the "Elastic License
1212# KDC installation steps and considerations based on https://web.mit.edu/kerberos/krb5-latest/doc/admin/install_kdc.html
1313# and helpful input from https://help.ubuntu.com/community/Kerberos
1414
15- VDIR=/fixture
16- RESOURCES=$VDIR /src/main/resources
15+ RESOURCES=/fixture
1716PROV_DIR=$RESOURCES /provision
1817ENVPROP_FILE=$RESOURCES /env.properties
1918LOCALSTATEDIR=/etc
@@ -53,7 +52,7 @@ touch $LOGDIR/krb5lib.log
5352kdb5_util create -s -r $REALM_NAME -P zyxwvutsrpqonmlk9876
5453
5554# Set up admin acls
56- cat << EOF > /etc /krb5kdc/kadm5.acl
55+ cat << EOF > /var/lib /krb5kdc/kadm5.acl
5756*/admin@$REALM_NAME *
5857*/*@$REALM_NAME i
5958EOF
Original file line number Diff line number Diff line change 1- #! /bin/bash
1+ #! /bin/sh
22
33set -e
44
You can’t perform that action at this time.
0 commit comments