From 6e31e41e4c69fa1a2d348cc4a372e4d8843f5436 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 13:10:45 +0000 Subject: [PATCH 1/2] Bump phusion/baseimage from jammy-1.0.1 to jammy-1.0.4 Bumps phusion/baseimage from jammy-1.0.1 to jammy-1.0.4. --- updated-dependencies: - dependency-name: phusion/baseimage dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 549d2f83e..f55b33727 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Single-stage build of an oxidized container from phusion/baseimage-docker jammy-1.0.1, derived from Ubuntu 22.04 (Jammy Jellyfish) -FROM docker.io/phusion/baseimage:jammy-1.0.1 +FROM docker.io/phusion/baseimage:jammy-1.0.4 # set up dependencies for the build process RUN apt-get -yq update \ From 0acc18275eb6dbd0a3abc6a67d581f781555df65 Mon Sep 17 00:00:00 2001 From: Robert Cheramy Date: Mon, 13 May 2024 16:35:30 +0200 Subject: [PATCH 2/2] Document the PR Documentation in CHANGELOG.md And while testing, I saw that the pid-file must me included in .gitignore --- CHANGELOG.md | 1 + examples/podman-compose/oxidized-config/.gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72140240e..09457680e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). - h3c: change prompt to expect either angle (user-view) or square (system-view) brackets (@nl987) - xos: Hide radius and user secrets for XOS (@iriseden) - eos: Hide radius and snmp secrets for Arista EOS (@iriseden) +- docker/podman: baseimage updated to phusion/baseimage:jammy-1.0.4 ### Fixed - fixed prompt for vyos/vyatta to allow logins with non-priviliged accounts. Fixes #3111 (@h-lopez) diff --git a/examples/podman-compose/oxidized-config/.gitignore b/examples/podman-compose/oxidized-config/.gitignore index 71290738b..e09f1b621 100644 --- a/examples/podman-compose/oxidized-config/.gitignore +++ b/examples/podman-compose/oxidized-config/.gitignore @@ -3,6 +3,7 @@ config.local router.db.local # Ignore logs, retrieved configs... +pid configs/ crash logs/