From 175dca7a4958cbbe240b84915c2a6a72892e6128 Mon Sep 17 00:00:00 2001 From: Andrey Bondarenko Date: Wed, 24 Sep 2025 13:54:49 +0200 Subject: [PATCH 1/3] Add apt-get upgrade to Dockerfiles Updated both Dockerfile.dev and Dockerfile.prod to include 'apt-get upgrade -qq' after 'apt-get update -qq' to ensure all packages are upgraded before installing dependencies. Addresses issue #1793 --- docker/Dockerfile.dev | 2 +- docker/Dockerfile.prod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index aed33719..a56e83e5 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -12,7 +12,7 @@ ENV SIDEKIQ_PASSWORD=password # Resolving sqlite3 error ENV PGSSENCMODE=disable -RUN apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ +RUN apt-get update -qq && apt-get upgrade -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ wget \ build-essential \ git \ diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index e5fd1d61..c36218bd 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -7,7 +7,7 @@ ENV RAILS_LOG_TO_STDOUT=true ENV RAILS_PORT=3000 ENV RAILS_ENV=production -RUN apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ +RUN apt-get update -qq && apt-get upgrade -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ wget \ build-essential \ git \ From 47704d2297a1d2972e8d68bb9cc853d466a2ef92 Mon Sep 17 00:00:00 2001 From: Andrey Bondarenko Date: Wed, 24 Sep 2025 14:00:51 +0200 Subject: [PATCH 2/3] Refactor Dockerfiles for improved readability Split long RUN commands in Dockerfile.dev and Dockerfile.prod into multiple lines for better readability and maintainability. No functional changes were made. --- docker/Dockerfile.dev | 4 +++- docker/Dockerfile.prod | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index a56e83e5..e8d74673 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -12,7 +12,9 @@ ENV SIDEKIQ_PASSWORD=password # Resolving sqlite3 error ENV PGSSENCMODE=disable -RUN apt-get update -qq && apt-get upgrade -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ +RUN apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ wget \ build-essential \ git \ diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index c36218bd..95e9d9f2 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -7,7 +7,9 @@ ENV RAILS_LOG_TO_STDOUT=true ENV RAILS_PORT=3000 ENV RAILS_ENV=production -RUN apt-get update -qq && apt-get upgrade -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ +RUN apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ wget \ build-essential \ git \ From d90413bfe148945f8a83744480ee1b4e5b1190dd Mon Sep 17 00:00:00 2001 From: Andrey Bondarenko Date: Sat, 4 Oct 2025 16:36:49 +0200 Subject: [PATCH 3/3] Resolve conflict Resolve conflict, add curl --- docker/Dockerfile.dev | 1 + docker/Dockerfile.prod | 1 + 2 files changed, 2 insertions(+) diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index e8d74673..4ac93bac 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -15,6 +15,7 @@ ENV PGSSENCMODE=disable RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + curl \ wget \ build-essential \ git \ diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index 95e9d9f2..e89f089e 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -10,6 +10,7 @@ ENV RAILS_ENV=production RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + curl \ wget \ build-essential \ git \