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 environment variable representing the path to the build context #16311

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion metricbeat/module/aerospike/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
aerospike:
image: docker.elastic.co/integrations-ci/beats-aerospike:${AEROSPIKE_VERSION:-3.9.0}-1
build:
context: ./_meta
context: ${AEROSPIKE_PATH:-.}/_meta
args:
AEROSPIKE_VERSION: ${AEROSPIKE_VERSION:-3.9.0}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/apache/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
apache:
image: docker.elastic.co/integrations-ci/beats-apache:${APACHE_VERSION:-2.4.20}-1
build:
context: ./_meta
context: ${APACHE_PATH:-.}/_meta
args:
APACHE_VERSION: ${APACHE_VERSION:-2.4.20}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/ceph/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
ceph:
image: docker.elastic.co/integrations-ci/beats-ceph:${CEPH_VERSION:-master-6373c6a-jewel-centos-7-x86_64}-1
build:
context: ./_meta
context: ${CEPH_PATH:-.}/_meta
args:
CEPH_VERSION: ${CEPH_VERSION:-master-6373c6a-jewel-centos-7-x86_64}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/consul/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
consul:
image: docker.elastic.co/integrations-ci/beats-consul:${CONSUL_VERSION:-1.4.2}-1
build:
context: ./_meta
context: ${CONSUL_PATH:-.}/_meta
args:
CONSUL_VERSION: ${CONSUL_VERSION:-1.4.2}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/couchbase/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
couchbase:
image: docker.elastic.co/integrations-ci/beats-couchbase:${COUCHBASE_VERSION:-4.5.1}-1
build:
context: ./_meta
context: ${COUCHBASE_PATH:-.}/_meta
args:
COUCHBASE_VERSION: ${COUCHBASE_VERSION:-4.5.1}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/couchdb/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
couchdb:
image: docker.elastic.co/integrations-ci/beats-couchdb:${COUCHDB_VERSION:-1.7}-1
build:
context: ./_meta
context: ${COUCHDB_PATH:-.}/_meta
args:
COUCHDB_VERSION: ${COUCHDB_VERSION:-1.7}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/dropwizard/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
dropwizard:
image: docker.elastic.co/integrations-ci/beats-dropwizard:${MAVEN_VERSION:-3.3-jdk-8}-1
build:
context: ./_meta
context: ${DROPWIZARD_PATH:-.}/_meta
args:
MAVEN_VERSION: ${MAVEN_VERSION:-3.3-jdk-8}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/envoyproxy/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
envoyproxy:
image: docker.elastic.co/integrations-ci/beats-envoyproxy:v${ENVOYPROXY_VERSION:-1.7.0}-1
build:
context: ./_meta
context: ${ENVOYPROXY_PATH:-.}/_meta
args:
ENVOYPROXY_VERSION: ${ENVOYPROXY_VERSION:-1.7.0}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/etcd/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
etcd:
image: docker.elastic.co/integrations-ci/beats-etcd:${ETCD_VERSION:-3.3.10}-1
build:
context: ./_meta
context: ${ETCD_PATH:-.}/_meta
args:
ETCD_VERSION: ${ETCD_VERSION:-3.3.10}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/golang/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ services:
golang:
image: docker.elastic.co/integrations-ci/beats-golang:1
build:
context: ./_meta
context: ${GOLANG_PATH:-.}/_meta
ports:
- 6060
2 changes: 1 addition & 1 deletion metricbeat/module/haproxy/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
haproxy:
image: docker.elastic.co/integrations-ci/beats-haproxy:${HAPROXY_VERSION:-1.8.22}-1
build:
context: ./_meta
context: ${HAPROXY_PATH:-.}/_meta
args:
HAPROXY_VERSION: ${HAPROXY_VERSION:-1.8.22}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/http/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ services:
http:
image: docker.elastic.co/integrations-ci/beats-http:1
build:
context: ./_meta
context: ${HTTP_PATH:-.}/_meta
ports:
- 8080
2 changes: 1 addition & 1 deletion metricbeat/module/jolokia/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
jolokia:
image: docker.elastic.co/integrations-ci/beats-jolokia:${JOLOKIA_VERSION:-1.5.0}-1
build:
context: ./_meta
context: ${JOLOKIA_PATH:-.}/_meta
args:
JOLOKIA_VERSION: ${JOLOKIA_VERSION:-1.5.0}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kafka/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
kafka:
image: docker.elastic.co/integrations-ci/beats-kafka:${KAFKA_VERSION:-2.1.1}-2
build:
context: ./_meta
context: ${KAFKA_PATH:-.}/_meta
args:
KAFKA_VERSION: ${KAFKA_VERSION:-2.1.1}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kubernetes/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:

#kubestate:
# build:
# context: ./_meta
# context: ${KUBERNETES_PATH:-.}/_meta
# dockerfile: Dockerfile.kube-state
# depends_on:
# - kubernetes
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/logstash/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
logstash:
image: docker.elastic.co/integrations-ci/beats-logstash:${LOGSTASH_VERSION:-7.5.2}-1
build:
context: ./_meta
context: ${LOGSTASH_PATH:-.}/_meta
args:
LOGSTASH_VERSION: ${LOGSTASH_VERSION:-7.5.2}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/memcached/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
memcached:
image: docker.elastic.co/integrations-ci/beats-memcached:${MEMCACHED_VERSION:-1.4.35}-1
build:
context: ./_meta
context: ${MEMCACHED_PATH:-.}/_meta
args:
MEMCACHED_VERSION: ${MEMCACHED_VERSION:-1.4.35}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/mongodb/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
mongodb:
image: docker.elastic.co/integrations-ci/beats-mongodb:${MONGODB_VERSION:-3.4}-1
build:
context: ./_meta
context: ${MONGODB_PATH:-.}/_meta
args:
MONGODB_VERSION: ${MONGODB_VERSION:-3.4}
command: mongod --replSet beats
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/munin/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ services:
munin:
image: docker.elastic.co/integrations-ci/beats-munin:1
build:
context: ./_meta
context: ${MUNIN_PATH:-.}/_meta
ports:
- 4949
2 changes: 1 addition & 1 deletion metricbeat/module/mysql/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
mysql:
image: docker.elastic.co/integrations-ci/beats-mysql:${MYSQL_VARIANT:-mysql}-${MYSQL_VERSION:-5.7.12}-1
build:
context: ./_meta
context: ${MYSQL_PATH:-.}/_meta
args:
MYSQL_IMAGE: ${MYSQL_VARIANT:-mysql}:${MYSQL_VERSION:-5.7.12}
ports:
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/module/nats/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
nats:
image: docker.elastic.co/integrations-ci/beats-nats:${NATS_VERSION:-2.0.4}-1
build:
context: ./_meta
context: ${NATS_PATH:-.}/_meta
dockerfile: Dockerfile.2.0.X
args:
NATS_VERSION: ${NATS_VERSION:-2.0.4}
Expand All @@ -14,7 +14,7 @@ services:
nats_1_3:
image: docker.elastic.co/integrations-ci/beats-nats:${NATS_VERSION:-1.3.0}-1
build:
context: ./_meta
context: ${NATS_PATH:-.}/_meta
dockerfile: Dockerfile.1.3
args:
NATS_VERSION: ${NATS_VERSION:-1.3.0}
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/nginx/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
nginx:
image: docker.elastic.co/integrations-ci/beats-nginx:${NGINX_VERSION:-1.9}-1
build:
context: ./_meta
context: ${NGINX_PATH:-.}/_meta
args:
NGINX_VERSION: ${NGINX_VERSION:-1.9}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/php_fpm/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
phpfpm:
image: docker.elastic.co/integrations-ci/beats-phpfpm:${PHPFPM_VERSION:-7.1}-1
build:
context: ./_meta
context: ${PHPFPM_PATH:-.}/_meta
args:
PHPFPM_VERSION: ${PHPFPM_VERSION:-7.1}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/postgresql/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
postgresql:
image: docker.elastic.co/integrations-ci/beats-postgresql:${POSTGRESQL_VERSION:-9.5.3}-1
build:
context: ./_meta
context: ${POSTGRESQL_PATH:-.}/_meta
args:
POSTGRESQL_VERSION: ${POSTGRESQL_VERSION:-9.5.3}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/prometheus/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
prometheus:
image: docker.elastic.co/integrations-ci/beats-prometheus:${PROMETHEUS_VERSION:-2.6.0}-1
build:
context: ./_meta
context: ${PROMETHEUS_PATH:-.}/_meta
args:
PROMETHEUS_VERSION: ${PROMETHEUS_VERSION:-2.6.0}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/rabbitmq/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
rabbitmq:
image: docker.elastic.co/integrations-ci/beats-rabbitmq:${RABBITMQ_VERSION:-3.7.4}-1
build:
context: ./_meta
context: ${RABBITMQ_PATH:-.}/_meta
args:
RABBITMQ_VERSION: ${RABBITMQ_VERSION:-3.7.4}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/redis/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
redis:
image: docker.elastic.co/integrations-ci/beats-redis:${REDIS_VERSION:-3.2.12}-1
build:
context: ./_meta
context: ${REDIS_PATH:-.}/_meta
args:
REDIS_VERSION: ${REDIS_VERSION:-3.2.12}
ports:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/traefik/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
traefik:
image: docker.elastic.co/integrations-ci/beats-traefik:${TRAEFIK_VERSION:-1.6}-1
build:
context: ./_meta
context: ${TRAEFIK_PATH:-.}/_meta
args:
TRAEFIK_VERSION: ${TRAEFIK_VERSION:-1.6}
ports:
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/module/uwsgi/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
uwsgi_tcp:
image: docker.elastic.co/integrations-ci/beats-uwsgi:py${PYTHON_VERSION:-3.6}-1
build:
context: ./_meta
context: ${UWSGI_PATH:-.}/_meta
args:
PYTHON_VERSION: ${PYTHON_VERSION:-3.6}
command: uwsgi --http :8080 --master --processes 1 --threads 2 --stats 0.0.0.0:9191 --memory-report --wsgi-file app.py
Expand All @@ -14,7 +14,7 @@ services:
uwsgi_http:
image: docker.elastic.co/integrations-ci/beats-uwsgi:py${PYTHON_VERSION:-3.6}-1
build:
context: ./_meta
context: ${UWSGI_PATH:-.}/_meta
args:
PYTHON_VERSION: ${PYTHON_VERSION:-3.6}
command: uwsgi --http :8080 --master --processes 1 --threads 2 --stats 0.0.0.0:9192 --memory-report --stats-http --wsgi-file app.py
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/zookeeper/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
zookeeper:
image: docker.elastic.co/integrations-ci/beats-zookeeper:${ZOOKEEPER_VERSION:-3.5.5}-1
build:
context: ./_meta
context: ${ZOOKEEPER_PATH:-.}/_meta
args:
ZOOKEEPER_VERSION: ${ZOOKEEPER_VERSION:-3.5.5}
ports:
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/activemq/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
activemq:
image: docker.elastic.co/integrations-ci/beats-activemq:${ACTIVEMQ_VERSION:-5.15.9}-1
build:
context: ./_meta
context: ${ACTIVEMQ_PATH:-.}/_meta
args:
ACTIVEMQ_VERSION: ${ACTIVEMQ_VERSION:-5.15.9}
ports:
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/appsearch/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '2.3'
services:
appsearch:
build:
context: ./_meta
context: ${APPSEARCH_PATH:-.}/_meta
depends_on:
- elasticsearch
environment:
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/cockroachdb/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
cockroachdb:
image: docker.elastic.co/integrations-ci/beats-cockroachdb:${COCKROACHDB_VERSION:-19.1.1}-1
build:
context: ./_meta
context: ${COCKROACHDB_PATH:-.}/_meta
args:
COCKROACHDB_VERSION: ${COCKROACHDB_VERSION:-19.1.1}
ports:
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/coredns/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
coredns:
image: docker.elastic.co/integrations-ci/beats-coredns:${COREDNS_VERSION:-1.5.0}-1
build:
context: ./_meta
context: ${COREDNS_PATH:-.}/_meta
args:
COREDNS_VERSION: ${COREDNS_VERSION:-1.5.0}
ports:
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/ibmmq/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
ibmmq:
image: docker.elastic.co/integrations-ci/beats-ibmmq:${IBMMQ_VERSION:-9.1.4.0-r1-amd64}-1
build:
context: ./_meta
context: ${IBMMQ_PATH:-.}/_meta
args:
IBMMQ_VERSION: ${IBMMQ_VERSION:-9.1.4.0-r1-amd64}
ports:
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/mssql/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
mssql:
image: docker.elastic.co/integrations-ci/beats-mssql:${MSSQL_VERSION:-2017-GA}-1
build:
context: ./_meta
context: ${MSSQL_PATH:-.}/_meta
args:
MSSQL_VERSION: ${MSSQL_VERSION:-2017-GA}
ports:
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/stan/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
stan:
image: docker.elastic.co/integrations-ci/beats-stan:${STAN_VERSION:-0.15.1}-1
build:
context: ./_meta
context: ${STAN_PATH:-.}/_meta
args:
STAN_VERSION: ${STAN_VERSION:-0.15.1}
ports:
Expand Down