Skip to content

Commit

Permalink
Upgrade ruby and ensure latest psql in docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
shayonj committed Dec 7, 2024
1 parent 5947232 commit 72a50db
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: Ruby ${{ matrix.ruby }} - PG ${{ matrix.pg.from }} -> PG ${{ matrix.pg.to }}
strategy:
matrix:
ruby: ["3.0.5", "3.1.4", "3.2.1"]
ruby: ["3.0.5", "3.1.4", "3.2.1", "3.3.6"]
pg:
[
{ from: 10, to: 11 },
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoke.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: Ruby ${{ matrix.ruby }} - PG ${{ matrix.pg.from }} -> PG ${{ matrix.pg.to }}
strategy:
matrix:
ruby: ["3.0.5", "3.1.4", "3.2.1"]
ruby: ["3.0.5", "3.1.4", "3.2.1", "3.3.6"]
pg:
[
{ from: 10, to: 11 },
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.4
3.3.6
21 changes: 18 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
FROM ruby:3.1.4
FROM ruby:3.1.4-slim

ARG VERSION

RUN apt-get update && apt-get install postgresql-client -y
RUN apt-get update && \
apt-get install -y --no-install-recommends \
wget \
gnupg2 \
lsb-release \
build-essential \
libpq-dev \
&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /usr/share/keyrings/postgresql-keyring.gpg && \
echo "deb [signed-by=/usr/share/keyrings/postgresql-keyring.gpg] http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
apt-get update && \
apt-get install -y --no-install-recommends postgresql-client && \
gem install pg_easy_replicate -v $VERSION && \
apt-get remove -y wget gnupg2 lsb-release && \
apt-get autoremove -y && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

RUN pg_dump --version
RUN gem install pg_easy_replicate -v $VERSION
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
pg_easy_replicate (0.3.7)
pg_easy_replicate (0.3.8)
ougai (~> 2.0.0)
pg (~> 1.5.3)
pg_query (~> 5.1.0)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -374,5 +374,5 @@ Next, you can set up a program that watches the `stats` and waits until `switcho
PRs most welcome. You can get started locally by
- `docker compose down -v && docker compose up --remove-orphans --build`
- Install ruby `3.1.4` using RVM ([instruction](https://rvm.io/rvm/install#any-other-system))
- Install ruby `3.3.6` using RVM ([instruction](https://rvm.io/rvm/install#any-other-system))
- `bundle exec rspec` for specs
2 changes: 1 addition & 1 deletion lib/pg_easy_replicate/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module PgEasyReplicate
VERSION = "0.3.7"
VERSION = "0.3.8"
end

0 comments on commit 72a50db

Please sign in to comment.