Update Dockerfile.dev and build_and_push.yml

Freika · Jan 30, 2025 · c80161d · c80161d
1 parent 375c50d
commit c80161d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.github/workflows/build_and_push.yml b/.github/workflows/build_and_push.yml
@@ -70,3 +70,5 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
+          build-args: |
+            BUNDLE_FORCE_RUBY_PLATFORM=1
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
@@ -13,6 +13,7 @@ RUN apk -U add --no-cache \
     git \
     postgresql-dev \
     postgresql-client \
+    libpq \
     libxml2-dev \
     libxslt-dev \
     nodejs \
@@ -22,6 +23,7 @@ RUN apk -U add --no-cache \
     less \
     yaml-dev \
     gcompat \
+    linux-headers \
     && mkdir -p $APP_PATH
 
 # Update gem system and install bundler
@@ -35,6 +37,7 @@ COPY ../Gemfile ../Gemfile.lock ../.ruby-version ../vendor ./
 
 # Install all gems into the image
 RUN bundle config set --local path 'vendor/bundle' \
+    && bundle config build.pg --with-pg-config=/usr/bin/pg_config \
     && bundle install --jobs 4 --retry 3 \
     && rm -rf vendor/bundle/ruby/3.3.0/cache/*.gem