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.

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

feat: add Oracle support on Metricbeat Docker images #12890

Merged
merged 17 commits into from
Mar 16, 2020
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
fix: change approach use the latest oracle instant basic bionaries
kuisathaverat committed Mar 12, 2020

Verified

This commit was signed with the committer’s verified signature.
esacteksab Barry Morrison
commit fab67a9d02033c6f886f5306aea74c1e9ef0b280
14 changes: 9 additions & 5 deletions metricbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM store/oracle/database-instantclient:12.2.0.1 as oracle
FROM golang:1.13.8

RUN \
apt-get update \
&& apt-get install -qq -y --no-install-recommends \
apt update \
&& apt install -qq -y --no-install-recommends \
netcat \
python3 \
python3-pip \
python3-venv \
libaio-dev \
unzip \
&& rm -rf /var/lib/apt/lists/*

ENV PYTHON_ENV=/tmp/python-env
@@ -18,8 +18,12 @@ RUN pip3 install --upgrade setuptools
RUN pip3 install --upgrade docker-compose==1.23.2

# Oracle instant client
COPY --from=oracle /usr/lib/oracle/12.2 /usr/lib/oracle/12.2
ENV LD_LIBRARY_PATH=/usr/lib/oracle/12.2/client64/lib
RUN cd /usr/lib \
&& curl -sLo instantclient-basic-linux.zip https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-basic-linux.x64-19.6.0.0.0dbru.zip \
&& unzip instantclient-basic-linux.zip \
&& rm instantclient-basic-linux.zip
ENV LD_LIBRARY_PATH=/usr/lib/instantclient_19_6
jsoriano marked this conversation as resolved.
Show resolved Hide resolved

ENV PATH=/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/oracle/12.2/client64/bin

# Add healthcheck for the docker/healthcheck metricset to check during testing.
1 change: 0 additions & 1 deletion metricbeat/Makefile
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ SYSTEM_TESTS?=true
TEST_ENVIRONMENT?=true
BEATS_DOCKER_INTEGRATION_TEST_ENV?=true
ES_BEATS?=..
DOCKER_PULL=0

# Metricbeat can only be cross-compiled on platforms not requiring CGO.
GOX_OS=netbsd linux windows
1 change: 0 additions & 1 deletion x-pack/metricbeat/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ES_BEATS ?= ../..
DOCKER_PULL=0

include $(ES_BEATS)/dev-tools/make/xpack.mk