Skip to content

Commit 3cdb2c3

Browse files
authored
Cherry-pick #11463 to 6.6: Remove jessie-updates repo from metricbeat docker images (#11471)
Cherry-pick of PR #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 5fcfa55)
1 parent dfaaff9 commit 3cdb2c3

File tree

6 files changed

+12
-3
lines changed

6 files changed

+12
-3
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM httpd:2.4.20
2+
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
23
RUN apt-get update && apt-get install -y curl
34
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost
45
COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM httpd:2.4.12
2+
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
23
RUN apt-get update && apt-get install -y curl
34
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost
45
COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
FROM mongo:3.4
2+
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
23
RUN apt-get update && apt-get install -y netcat
34
HEALTHCHECK --interval=1s --retries=90 CMD nc -z localhost 27017
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
FROM mysql:5.7.12
2-
RUN apt-get update && apt-get install -y netcat
3-
HEALTHCHECK --interval=1s --retries=90 CMD nc -z localhost 3306
1+
ARG MYSQL_IMAGE=mysql:5.7.12
2+
FROM $MYSQL_IMAGE
43

54
ENV MYSQL_ROOT_PASSWORD test
5+
6+
HEALTHCHECK --interval=1s --retries=90 CMD mysql -u root -p$MYSQL_ROOT_PASSWORD -h$HOSTNAME -P 3306 -e "SHOW STATUS" > /dev/null
7+
8+
COPY test.cnf /etc/mysql/conf.d/test.cnf
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[mysqld]
2+
bind-address = 0.0.0.0
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM nginx:1.9
2+
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
23
RUN apt-get update && apt-get install -y curl
34
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status
45
COPY ./nginx.conf /etc/nginx/

0 commit comments

Comments
 (0)