Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 5b61e06

Browse files
authoredApr 5, 2021
Merge branch 'master' into maps/remove_licensing
2 parents 4a6f59e + a640522 commit 5b61e06

File tree

161 files changed

+7702
-513
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+7702
-513
lines changed
 

‎docs/setup/docker.asciidoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@ docker pull {docker-repo}:{version}
3939
=== Run Kibana on Docker for development
4040
Kibana can be quickly started and connected to a local Elasticsearch container for development
4141
or testing use with the following command:
42-
--------------------------------------------
42+
43+
[source,sh,subs="attributes"]
44+
----
4345
docker run --link YOUR_ELASTICSEARCH_CONTAINER_NAME_OR_ID:elasticsearch -p 5601:5601 {docker-repo}:{version}
44-
--------------------------------------------
45-
endif::[]
46+
----
4647

48+
endif::[]
4749
[float]
4850
[[configuring-kibana-docker]]
4951
=== Configure Kibana on Docker

‎src/dev/build/tasks/os_packages/create_os_package_tasks.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ export const CreateRpmPackage: Task = {
4949
},
5050
};
5151

52+
const dockerBuildDate = new Date().toISOString();
5253
export const CreateDockerCentOS: Task = {
5354
description: 'Creating Docker CentOS image',
5455

@@ -57,11 +58,13 @@ export const CreateDockerCentOS: Task = {
5758
architecture: 'x64',
5859
context: false,
5960
image: true,
61+
dockerBuildDate,
6062
});
6163
await runDockerGenerator(config, log, build, {
6264
architecture: 'aarch64',
6365
context: false,
6466
image: true,
67+
dockerBuildDate,
6568
});
6669
},
6770
};
@@ -76,6 +79,7 @@ export const CreateDockerUBI: Task = {
7679
context: false,
7780
ubi: true,
7881
image: true,
82+
dockerBuildDate,
7983
});
8084
}
8185
},
@@ -88,18 +92,21 @@ export const CreateDockerContexts: Task = {
8892
await runDockerGenerator(config, log, build, {
8993
context: true,
9094
image: false,
95+
dockerBuildDate,
9196
});
9297

9398
if (!build.isOss()) {
9499
await runDockerGenerator(config, log, build, {
95100
ubi: true,
96101
context: true,
97102
image: false,
103+
dockerBuildDate,
98104
});
99105
await runDockerGenerator(config, log, build, {
100106
ironbank: true,
101107
context: true,
102108
image: false,
109+
dockerBuildDate,
103110
});
104111
}
105112
},

0 commit comments

Comments
 (0)
Please sign in to comment.