Skip to content

Commit

Permalink
[chore] bump debian version (#21177)
Browse files Browse the repository at this point in the history
Getting 404s when trying to run apt update w/ debian 9

---------

Signed-off-by: Alex Boten <[email protected]>
  • Loading branch information
Alex Boten authored Apr 26, 2023
1 parent 84d9f48 commit 80069fb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion internal/buildscripts/packaging/fpm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:9
FROM debian:11

RUN apt-get update && \
apt-get install -y ruby ruby-dev rubygems build-essential git rpm
Expand Down
32 changes: 16 additions & 16 deletions internal/buildscripts/packaging/fpm/deb/Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# A debian9 image with systemd enabled. Must be run with:
# A debian11 image with systemd enabled. Must be run with:
# `-d --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro` flags
FROM debian:9

RUN apt-get update &&\
apt-get install -yq ca-certificates procps systemd
FROM debian:11

ENV container docker
RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \
"systemd-tmpfiles-setup.service" ] || rm -f $i; done); \
rm -f /lib/systemd/system/multi-user.target.wants/*;\
rm -f /lib/systemd/system/local-fs.target.wants/*; \
rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
rm -f /lib/systemd/system/anaconda.target.wants/*;
ENV DEBIAN_FRONTEND noninteractive

RUN systemctl set-default multi-user.target
ENV init /lib/systemd/systemd
# Enable systemd.
RUN apt-get update ; \
apt-get install -y systemd systemd-sysv procps; \
apt-get clean ; \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ; \
rm -rf /lib/systemd/system/multi-user.target.wants/* ; \
rm -rf /etc/systemd/system/*.wants/* ; \
rm -rf /lib/systemd/system/local-fs.target.wants/* ; \
rm -rf /lib/systemd/system/sockets.target.wants/*udev* ; \
rm -rf /lib/systemd/system/sockets.target.wants/*initctl* ; \
rm -rf /lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup* ; \
rm -rf /lib/systemd/system/systemd-update-utmp*

VOLUME [ "/sys/fs/cgroup" ]

ENTRYPOINT ["/lib/systemd/systemd"]
CMD ["/lib/systemd/systemd"]

0 comments on commit 80069fb

Please sign in to comment.