Commit 68c034f6 authored by Jan Klare's avatar Jan Klare
Browse files

forked from github, changes to use our own repo

parent 5214007b
......@@ -5,31 +5,26 @@ ifndef ELASTIC_VERSION
export ELASTIC_VERSION := $(shell cat version.txt)
endif
ifdef STAGING_BUILD_NUM
VERSION_TAG=$(ELASTIC_VERSION)-${STAGING_BUILD_NUM}
else
VERSION_TAG=$(ELASTIC_VERSION)
endif
VERSION_TAG=$(ELASTIC_VERSION)_$(shell date +%Y%m%d%H%M)
REGISTRY=docker.elastic.co
IMAGE=$(REGISTRY)/logstash/logstash
VERSIONED_IMAGE=$(IMAGE):$(VERSION_TAG)
REGISTRY := registry.gitlab.x-ion.de
IMAGE := $(REGISTRY)/docker/logstash
test: build
bin/testinfra -v tests/
build: dockerfile docker-compose.yml env2yaml
docker build --pull -t $(VERSIONED_IMAGE) build/logstash
docker build -t $(IMAGE):$(VERSION_TAG) -t $(IMAGE):latest build/logstash
demo: docker-compose.yml clean-demo
docker-compose up
push: test
docker push $(VERSIONED_IMAGE)
docker push $(IMAGE)
# The tests are written in Python. Make a virtualenv to handle the dependencies.
venv: requirements.txt
test -d venv || virtualenv --python=python3.5 venv
test -d venv || virtualenv --python=python3.6 venv
pip install -r requirements.txt
touch venv
......
......@@ -10,7 +10,7 @@
FROM centos:7
LABEL maintainer "Elastic Docker Team <docker@elastic.co>"
LABEL maintainer "x-ion GmbH"
# Install Java and the "which" command, which is needed by Logstash's shell
# scripts.
......@@ -48,8 +48,6 @@ RUN chmod 0755 /usr/local/bin/docker-entrypoint
USER logstash
RUN cd /usr/share/logstash && LOGSTASH_PACK_URL={{ pack_url }} logstash-plugin install x-pack
ADD env2yaml/env2yaml /usr/local/bin/
EXPOSE 9600 5044
......
......@@ -2,19 +2,19 @@
version: '3.0'
services:
logstash:
image: docker.elastic.co/logstash/logstash:{{ version_tag }}
image: registry.gitlab.x-ion.de/docker/logstash:{{ version_tag }}
volumes:
- ./examples/logstash.conf/:/usr/share/logstash/pipeline/logstash.conf
networks:
- elastic-stack
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:{{ version_tag }}
image: registry.gitlab.x-ion.de/docker/elasticsearch:latest
networks:
- elastic-stack
kibana:
image: docker.elastic.co/kibana/kibana:{{ version_tag }}
image: registry.gitlab.x-ion.de/docker/kibana:latest
ports: [ '5601:5601' ]
networks:
- elastic-stack
......
......@@ -13,5 +13,5 @@ try:
except KeyError:
pass
image = 'docker.elastic.co/logstash/logstash:' + version
image = 'registry.gitlab.x-ion.de/docker/logstash:' + version
container_name = 'logstash'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment