Skip to content

Commit

Permalink
Tweak package tests
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticsearchmachine committed Dec 4, 2024
1 parent b8d51b1 commit a23256c
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
*/

package org.elasticsearch.gradle.internal.distribution;

import org.elasticsearch.gradle.ElasticsearchDistributionType;

public class DockerFipsElasticsearchDistributionType implements ElasticsearchDistributionType {

DockerFipsElasticsearchDistributionType() {}

@Override
public String getName() {
return "dockerFips";
}

@Override
public boolean isDocker() {
return true;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class InternalElasticsearchDistributionTypes {
public static ElasticsearchDistributionType DOCKER_IRONBANK = new DockerIronBankElasticsearchDistributionType();
public static ElasticsearchDistributionType DOCKER_CLOUD_ESS = new DockerCloudEssElasticsearchDistributionType();
public static ElasticsearchDistributionType DOCKER_WOLFI = new DockerWolfiElasticsearchDistributionType();
public static ElasticsearchDistributionType DOCKER_FIPS = new DockerWolfiElasticsearchDistributionType();
public static ElasticsearchDistributionType DOCKER_FIPS = new DockerFipsElasticsearchDistributionType();

public static List<ElasticsearchDistributionType> ALL_INTERNAL = List.of(
DEB,
Expand Down
3 changes: 2 additions & 1 deletion distribution/docker/src/docker/Dockerfile.fips
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN cat <<EOF > instance.yml
instances:
- name: "node1"
dns:
- "node1.example.com"
- "node1.local"
cn:
- "node1.elasticsearch.cluster"
EOF
Expand All @@ -29,6 +29,7 @@ RUN cp node1/node1.key config
WORKDIR /usr/share/elasticsearch/config
# Add fips specific configuration
RUN cat <<EOF >> elasticsearch.yml
cache.hash_algo: "ssha256"
xpack.security.fips_mode.enabled: true
xpack.security.enabled: true
xpack.security.http.ssl.enabled: true
Expand Down

0 comments on commit a23256c

Please sign in to comment.