Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
elasticsearch
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container registry
Monitor
Service Desk
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ai3
docker
elasticsearch
Commits
33d95632
Commit
33d95632
authored
6 years ago
by
ale
Browse files
Options
Downloads
Patches
Plain Diff
Fix build.sh
parent
3133c283
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+2
-0
2 additions, 0 deletions
Dockerfile
build.sh
+6
-2
6 additions, 2 deletions
build.sh
conf/chaperone.d/elasticsearch.conf
+1
-1
1 addition, 1 deletion
conf/chaperone.d/elasticsearch.conf
with
9 additions
and
3 deletions
Dockerfile
+
2
−
0
View file @
33d95632
...
...
@@ -4,3 +4,5 @@ COPY conf /tmp/conf
COPY
build.sh /tmp/build.sh
RUN
/tmp/build.sh
&&
rm
/tmp/build.sh
ENTRYPOINT
["/usr/local/bin/chaperone"]
This diff is collapsed.
Click to expand it.
build.sh
+
6
−
2
View file @
33d95632
...
...
@@ -5,7 +5,7 @@
# Packages that are only used to build the container. These will be
# removed once we're done.
BUILD_PACKAGES
=
"gnupg rsync"
BUILD_PACKAGES
=
"
curl
gnupg rsync
apt-transport-https
"
# Packages to install.
PACKAGES
=
"
...
...
@@ -66,7 +66,7 @@ EOF
echo
"deb [arch=amd64] https://packages.elastic.co/curator/5/debian9 stable main"
)
\
>
/etc/apt/sources.list.d/elastic.list
apt-get
-qq
update
apt-get update
# If we do not install a JRE before ES, the installation will fail (huh?)...
install_packages default-jre-headless
...
...
@@ -79,6 +79,10 @@ curl -sL ${EXPORTER_RELEASE_URL} \
>
/usr/sbin/elasticsearch_exporter
chmod
755 /usr/sbin/elasticsearch_exporter
# For some reason the Debian package installs the /etc/default file
# with very restrictive permissions.
chmod
644 /etc/default/elasticsearch
# Overlay our configuration on top of /etc.
rsync
-a
/tmp/conf/ /etc/
...
...
This diff is collapsed.
Click to expand it.
conf/chaperone.d/elasticsearch.conf
+
1
−
1
View file @
33d95632
elasticsearch
.
service
: {
command
:
"/bin/sh -c 'exec
env ES_HOME=/usr/share/elasticsearch ES_PATH_CONF=/etc/elasticsearch
/usr/share/elasticsearch/bin/elasticsearch -E http.port=${PORT}'"
,
command
:
"/bin/sh -c 'exec /usr/share/elasticsearch/bin/elasticsearch -E http.port=${PORT}'"
,
kill_signal
:
SIGTERM
,
exit_kills
:
true
,
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment