Skip to content

Commit

Permalink
Cherry-pick elastic#11463 to 6.6: Remove jessie-updates repo from met…
Browse files Browse the repository at this point in the history
…ricbeat docker images (elastic#11471)

Cherry-pick of PR elastic#11463 to 6.6 branch. Original message: 

jessie-updates is not available anymore and it is used by some images,
so CI builds fail with:
```
W: Failed to fetch http://httpredir.debian.org/debian/dists/jessie-updates/main/binary-amd64/Packages  404  Not Found
```
The repo is not really needed for the matter of the tests, so removing it.

(cherry picked from commit 8eebebd)
  • Loading branch information
jsoriano authored Mar 26, 2019
1 parent 8ad2b92 commit f66fe6d
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 3 deletions.
1 change: 1 addition & 0 deletions metricbeat/module/apache/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM httpd:2.4.20
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
RUN apt-get update && apt-get install -y curl
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost
COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf
1 change: 1 addition & 0 deletions metricbeat/module/apache/_meta/Dockerfile.2.4.12
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM httpd:2.4.12
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
RUN apt-get update && apt-get install -y curl
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost
COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf
1 change: 1 addition & 0 deletions metricbeat/module/mongodb/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FROM mongo:3.4
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
RUN apt-get update && apt-get install -y netcat
HEALTHCHECK --interval=1s --retries=90 CMD nc -z localhost 27017
9 changes: 6 additions & 3 deletions metricbeat/module/mysql/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM mysql:5.7.12
RUN apt-get update && apt-get install -y netcat
HEALTHCHECK --interval=1s --retries=90 CMD nc -z localhost 3306
ARG MYSQL_IMAGE=mysql:5.7.12
FROM $MYSQL_IMAGE

ENV MYSQL_ROOT_PASSWORD test

HEALTHCHECK --interval=1s --retries=90 CMD mysql -u root -p$MYSQL_ROOT_PASSWORD -h$HOSTNAME -P 3306 -e "SHOW STATUS" > /dev/null

COPY test.cnf /etc/mysql/conf.d/test.cnf
2 changes: 2 additions & 0 deletions metricbeat/module/mysql/_meta/test.cnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[mysqld]
bind-address = 0.0.0.0
1 change: 1 addition & 0 deletions metricbeat/module/nginx/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM nginx:1.9
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
RUN apt-get update && apt-get install -y curl
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status
COPY ./nginx.conf /etc/nginx/

0 comments on commit f66fe6d

Please sign in to comment.