Skip to content

Commit 12c7623

Browse files
mrodmmrodm
committed
Use debian archive for containers based Debian buster
1 parent 454af78 commit 12c7623

File tree

8 files changed

+32
-8
lines changed

8 files changed

+32
-8
lines changed

‎test/packages/false_positives/nginx_missing_deployer/_dev/deploy/docker/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5}
22
FROM nginx:${SERVICE_VERSION}
3-
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
3+
# move to archive
4+
RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \
5+
sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \
6+
sed -i "/buster-updates/d" /etc/apt/sources.list
47
RUN apt-get update && apt-get install -y curl
58
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status
69
COPY ./nginx.conf /etc/nginx/

‎test/packages/false_positives/nginx_missing_deployer/data_stream/access/_dev/deploy/docker/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5}
22
FROM nginx:${SERVICE_VERSION}
3-
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
3+
# move to archive
4+
RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \
5+
sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \
6+
sed -i "/buster-updates/d" /etc/apt/sources.list
47
RUN apt-get update && apt-get install -y curl
58
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status
69
COPY ./nginx.conf /etc/nginx/

‎test/packages/parallel/apache/_dev/deploy/docker/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
ARG SERVICE_VERSION=${SERVICE_VERSION:-2.4.46}
22
FROM httpd:$SERVICE_VERSION
3-
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
3+
# move to archive
4+
RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \
5+
sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \
6+
sed -i "/buster-updates/d" /etc/apt/sources.list
47
RUN apt-get update && apt-get install -y curl
58
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost
69
COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf

‎test/packages/parallel/apache_basic_license/_dev/deploy/docker/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
ARG SERVICE_VERSION=${SERVICE_VERSION:-2.4.46}
22
FROM httpd:$SERVICE_VERSION
3-
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
3+
# move to archive
4+
RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \
5+
sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \
6+
sed -i "/buster-updates/d" /etc/apt/sources.list
47
RUN apt-get update && apt-get install -y curl
58
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost
69
COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf

‎test/packages/parallel/nginx/_dev/deploy/docker/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5}
22
FROM nginx:${SERVICE_VERSION}
3-
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
3+
# move to archive
4+
RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \
5+
sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \
6+
sed -i "/buster-updates/d" /etc/apt/sources.list
47
RUN apt-get update && apt-get install -y curl
58
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status
69
COPY ./nginx.conf /etc/nginx/

‎test/packages/parallel/nginx_multiple_services/_dev/deploy/docker/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5}
22
FROM nginx:${SERVICE_VERSION}
3-
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
3+
# move to archive
4+
RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \
5+
sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \
6+
sed -i "/buster-updates/d" /etc/apt/sources.list
47
RUN apt-get update && apt-get install -y curl
58
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status
69
COPY ./nginx.conf /etc/nginx/

‎test/packages/parallel/nginx_multiple_services/data_stream/access/_dev/deploy/docker/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5}
22
FROM nginx:${SERVICE_VERSION}
3-
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
3+
# move to archive
4+
RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \
5+
sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \
6+
sed -i "/buster-updates/d" /etc/apt/sources.list
47
RUN apt-get update && apt-get install -y curl
58
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status
69
COPY ./nginx.conf /etc/nginx/

‎test/packages/parallel/nginx_multiple_services/data_stream/access_docker_tf/_dev/deploy/docker/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5}
22
FROM nginx:${SERVICE_VERSION}
3-
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
3+
# move to archive
4+
RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \
5+
sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \
6+
sed -i "/buster-updates/d" /etc/apt/sources.list
47
RUN apt-get update && apt-get install -y curl
58
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status
69
COPY ./nginx.conf /etc/nginx/

0 commit comments

Comments
 (0)