Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move beat specific logic to docker-compose #665

Merged
merged 1 commit into from
Jan 8, 2016
Merged

Move beat specific logic to docker-compose #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,10 @@ RUN set -x \

COPY scripts/docker-entrypoint.sh /entrypoint.sh

# Setup work environment
ENV LIBBEAT_PATH /go/src/github.com/elastic/beats/libbeat
ENV GO15VENDOREXPERIMENT=1
RUN mkdir -p $LIBBEAT_PATH/coverage
WORKDIR $LIBBEAT_PATH

RUN mkdir -p /etc/pki/tls/certs
COPY scripts/docker/logstash/pki/tls/certs/logstash.crt /etc/pki/tls/certs/logstash.crt

# Create a copy of the respository inside the container.
COPY . /go/src/github.com/elastic/beats/

# It is expected that libbeat from the host is mounted
# within the container at the WORKDIR location.
ENTRYPOINT ["/entrypoint.sh"]

# Build libbeat inside of the container so that it is ready
# for testing.
RUN make
5 changes: 5 additions & 0 deletions libbeat/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,13 @@ libbeat:
- LS_TLS_PORT=5055
- ES_USER=beats
- ES_PASS=testing
# Setup work environment
- LIBBEAT_PATH=/go/src/github.com/elastic/beats/libbeat
env_file:
- build/test.env
working_dir: /go/src/github.com/elastic/beats/libbeat
command: make
entrypoint: /entrypoint.sh
elasticsearch:
build: ../scripts/docker/elasticsearch
dockerfile: Dockerfile-2.2.0
Expand Down