From d90413bfe148945f8a83744480ee1b4e5b1190dd Mon Sep 17 00:00:00 2001 From: Andrey Bondarenko Date: Sat, 4 Oct 2025 16:36:49 +0200 Subject: [PATCH] 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 \