Skip to content

Commit 3f203b4

Browse files
Tweak package tests
1 parent 0437da9 commit 3f203b4

File tree

3 files changed

+30
-2
lines changed

3 files changed

+30
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
8+
*/
9+
10+
package org.elasticsearch.gradle.internal.distribution;
11+
12+
import org.elasticsearch.gradle.ElasticsearchDistributionType;
13+
14+
public class DockerFipsElasticsearchDistributionType implements ElasticsearchDistributionType {
15+
16+
DockerFipsElasticsearchDistributionType() {}
17+
18+
@Override
19+
public String getName() {
20+
return "dockerFips";
21+
}
22+
23+
@Override
24+
public boolean isDocker() {
25+
return true;
26+
}
27+
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class InternalElasticsearchDistributionTypes {
2020
public static ElasticsearchDistributionType DOCKER_IRONBANK = new DockerIronBankElasticsearchDistributionType();
2121
public static ElasticsearchDistributionType DOCKER_CLOUD_ESS = new DockerCloudEssElasticsearchDistributionType();
2222
public static ElasticsearchDistributionType DOCKER_WOLFI = new DockerWolfiElasticsearchDistributionType();
23-
public static ElasticsearchDistributionType DOCKER_FIPS = new DockerWolfiElasticsearchDistributionType();
23+
public static ElasticsearchDistributionType DOCKER_FIPS = new DockerFipsElasticsearchDistributionType();
2424

2525
public static List<ElasticsearchDistributionType> ALL_INTERNAL = List.of(
2626
DEB,

distribution/docker/src/docker/Dockerfile.fips

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN cat <<EOF > instance.yml
1717
instances:
1818
- name: "node1"
1919
dns:
20-
- "node1.example.com"
20+
- "node1.local"
2121
cn:
2222
- "node1.elasticsearch.cluster"
2323
EOF
@@ -29,6 +29,7 @@ RUN cp node1/node1.key config
2929
WORKDIR /usr/share/elasticsearch/config
3030
# Add fips specific configuration
3131
RUN cat <<EOF >> elasticsearch.yml
32+
cache.hash_algo: "ssha256"
3233
xpack.security.fips_mode.enabled: true
3334
xpack.security.enabled: true
3435
xpack.security.http.ssl.enabled: true

0 commit comments

Comments
 (0)