Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
df80b76d
Unverified
Commit
df80b76d
authored
Apr 11, 2017
by
Christian Koep
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor gcr.io/google_containers/elasticsearch to alpine
Signed-off-by:
Christian Koep
<
christiankoep@gmail.com
>
parent
33356a18
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
24 additions
and
18 deletions
+24
-18
.gitignore
cluster/addons/fluentd-elasticsearch/es-image/.gitignore
+1
-0
Dockerfile
cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
+11
-6
Makefile
cluster/addons/fluentd-elasticsearch/es-image/Makefile
+3
-3
elasticsearch_logging_discovery.go
...elasticsearch/es-image/elasticsearch_logging_discovery.go
+1
-1
run.sh
cluster/addons/fluentd-elasticsearch/es-image/run.sh
+2
-2
Dockerfile
.../addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
+1
-1
Makefile
...er/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+1
-1
build.sh
...er/addons/fluentd-elasticsearch/fluentd-es-image/build.sh
+1
-1
Dockerfile
cluster/addons/fluentd-elasticsearch/kibana-image/Dockerfile
+1
-1
Makefile
cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
+1
-1
run.sh
cluster/addons/fluentd-elasticsearch/kibana-image/run.sh
+1
-1
No files found.
cluster/addons/fluentd-elasticsearch/es-image/.gitignore
0 → 100644
View file @
df80b76d
elasticsearch_logging_discovery
cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
View file @
df80b76d
# Copyright 201
6
The Kubernetes Authors.
# Copyright 201
7
The Kubernetes Authors.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# you may not use this file except in compliance with the License.
...
@@ -16,15 +16,19 @@
...
@@ -16,15 +16,19 @@
# to work with Kubernetes logging. Inspired by the Dockerfile
# to work with Kubernetes logging. Inspired by the Dockerfile
# dockerfile/elasticsearch
# dockerfile/elasticsearch
FROM
java:openjdk-8-jre
FROM
java:openjdk-8-jre
-alpine
ENV
DEBIAN_FRONTEND noninteractive
ENV
ELASTICSEARCH_VERSION 2.4.1
ENV
ELASTICSEARCH_VERSION 2.4.1
RUN
apt-get update
\
RUN
apk update
&&
\
&&
apt-get
install
-y
curl gosu
\
apk
--no-cache
add
\
&&
apt-get clean
--repository
https://dl-3.alpinelinux.org/alpine/edge/testing
\
--repository
https://dl-3.alpinelinux.org/alpine/edge/community
\
curl
\
shadow
\
tar
\
gosu
RUN
set
-x
\
RUN
set
-x
\
&&
cd
/
\
&&
cd
/
\
...
@@ -45,6 +49,7 @@ RUN useradd --no-create-home --user-group elasticsearch \
...
@@ -45,6 +49,7 @@ RUN useradd --no-create-home --user-group elasticsearch \
&&
mkdir
/data
\
&&
mkdir
/data
\
&&
chown
-R
elasticsearch:elasticsearch /elasticsearch
&&
chown
-R
elasticsearch:elasticsearch /elasticsearch
VOLUME
["/data"]
VOLUME
["/data"]
EXPOSE
9200 9300
EXPOSE
9200 9300
...
...
cluster/addons/fluentd-elasticsearch/es-image/Makefile
View file @
df80b76d
# Copyright 201
6
The Kubernetes Authors.
# Copyright 201
7
The Kubernetes Authors.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# you may not use this file except in compliance with the License.
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
# The current value of the tag to be used for building and
# The current value of the tag to be used for building and
# pushing an image to gcr.io
# pushing an image to gcr.io
TAG
=
v2.4.1-
2
TAG
=
v2.4.1-
3
build
:
elasticsearch_logging_discovery
build
:
elasticsearch_logging_discovery
docker build
--pull
-t
gcr.io/google_containers/elasticsearch:
$(TAG)
.
docker build
--pull
-t
gcr.io/google_containers/elasticsearch:
$(TAG)
.
...
@@ -25,7 +25,7 @@ push:
...
@@ -25,7 +25,7 @@ push:
gcloud docker
--
push gcr.io/google_containers/elasticsearch:
$(TAG)
gcloud docker
--
push gcr.io/google_containers/elasticsearch:
$(TAG)
elasticsearch_logging_discovery
:
elasticsearch_logging_discovery
:
go build
-a
-ldflags
"-w"
elasticsearch_logging_discovery.go
CGO_ENABLED
=
0
GOOS
=
linux
go build
-a
-ldflags
"-w"
elasticsearch_logging_discovery.go
clean
:
clean
:
rm
elasticsearch_logging_discovery
rm
elasticsearch_logging_discovery
cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
View file @
df80b76d
/*
/*
Copyright 201
5
The Kubernetes Authors.
Copyright 201
7
The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
you may not use this file except in compliance with the License.
...
...
cluster/addons/fluentd-elasticsearch/es-image/run.sh
View file @
df80b76d
#!/bin/
ba
sh
#!/bin/sh
# Copyright 201
5
The Kubernetes Authors.
# Copyright 201
7
The Kubernetes Authors.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# you may not use this file except in compliance with the License.
...
...
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
View file @
df80b76d
# Copyright 201
6
The Kubernetes Authors.
# Copyright 201
7
The Kubernetes Authors.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# you may not use this file except in compliance with the License.
...
...
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View file @
df80b76d
# Copyright 201
6
The Kubernetes Authors.
# Copyright 201
7
The Kubernetes Authors.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# you may not use this file except in compliance with the License.
...
...
cluster/addons/fluentd-elasticsearch/fluentd-es-image/build.sh
View file @
df80b76d
#!/bin/sh
#!/bin/sh
# Copyright 201
5
The Kubernetes Authors.
# Copyright 201
7
The Kubernetes Authors.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# you may not use this file except in compliance with the License.
...
...
cluster/addons/fluentd-elasticsearch/kibana-image/Dockerfile
View file @
df80b76d
# Copyright 201
6
The Kubernetes Authors.
# Copyright 201
7
The Kubernetes Authors.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# you may not use this file except in compliance with the License.
...
...
cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
View file @
df80b76d
# Copyright 201
6
The Kubernetes Authors.
# Copyright 201
7
The Kubernetes Authors.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# you may not use this file except in compliance with the License.
...
...
cluster/addons/fluentd-elasticsearch/kibana-image/run.sh
View file @
df80b76d
#!/bin/sh
#!/bin/sh
# Copyright 201
5
The Kubernetes Authors.
# Copyright 201
7
The Kubernetes Authors.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# you may not use this file except in compliance with the License.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment