Merge pull request #280 from unboxed/fix-debian-versions

Fix dockerfiles still using Debian bullseye (oldstable)

.github/workflows/deploy-environment.yml

@@ -24,7 +24,7 @@ permissions:
 jobs:
   build-image:
     name: Create and push docker image to ECR for ${{ inputs.environment-name }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     environment: ${{ inputs.environment-name }}
 
     steps:
@@ -73,7 +73,7 @@ jobs:
 
   deploy-services:
     name: Deploy services to ${{ inputs.environment-name }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [build-image]
     strategy:
       matrix:
@@ -144,7 +144,7 @@ jobs:
 
   tag-release:
     name: Tag release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [build-image]
     permissions:
       contents: write

.github/workflows/linters.yml

@@ -23,7 +23,7 @@ on:
 jobs:
   linters:
     name: Linters
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       BUNDLE_WITHOUT: development
 

.github/workflows/testing.yml

@@ -30,7 +30,7 @@ on:
 jobs:
   tests:
     name: ${{ inputs.name }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     services:
       postgres:

Dockerfile.production

@@ -1,7 +1,7 @@
 # Base image for all other build stages
 ARG RUBY_VERSION=3.4.1
 
-FROM ruby:$RUBY_VERSION-slim-bullseye AS base_image
+FROM ruby:$RUBY_VERSION-slim-bookworm AS base_image
 
 # Run security updates and install apt-utils curl and locales
 RUN bash -c "export DEBIAN_FRONTEND=noninteractive && \
@@ -46,11 +46,11 @@ FROM build_image AS gems
 
 # Required system packages
 
-# Run security updates, install libpq-dev
+# Run security updates, install libpq-dev and libyaml-dev
 RUN bash -c "export DEBIAN_FRONTEND=noninteractive && \
     apt-get update -qq && \
     apt-get upgrade -y && \
-    apt-get install -y libpq-dev && \
+    apt-get install -y libpq-dev libyaml-dev && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*"
 

docker-compose.yml

@@ -1,7 +1,7 @@
 ---
 services:
   db:
-    image: postgres:14-bullseye
+    image: postgres:14-bookworm
     volumes:
       - type: volume
         source: db

docker/ruby/Dockerfile

@@ -1,20 +1,20 @@
 ARG RUBY_VERSION=3.4.1
 
-FROM ruby:$RUBY_VERSION-bullseye
+FROM ruby:$RUBY_VERSION-slim-bookworm
 
 ENV BUNDLE_PATH=/home/rails/bundle
 
 # Run security updates and install apt-utils curl and locales
 RUN bash -c "export DEBIAN_FRONTEND=noninteractive && \
     apt-get update -qq && \
     echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && \
-    apt-get install -y apt-utils curl locales && \
+    apt-get install -y apt-utils curl locales gnupg && \
     apt-get upgrade -y && apt-get clean"
 
 # Install PostgreSQL client
-RUN bash -c "echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' \
+RUN bash -c "echo 'deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main' \
     > /etc/apt/sources.list.d/pgdg.list && \
-    wget -q -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+    curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc \
     | apt-key add - && apt-get update && \
     apt-get install -y --no-install-recommends postgresql-client-14"