Skip to content

Commit

Permalink
chore: update deps to ruby3.2 and psql14 (#113)
Browse files Browse the repository at this point in the history
  • Loading branch information
YOU54F authored Oct 16, 2023
1 parent 2e715ce commit 1b23692
Show file tree
Hide file tree
Showing 19 changed files with 15,145 additions and 5,437 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

deploy_layer:
docker:
- image: circleci/node:8.17
- image: circleci/node:18
environment:
TERM: xterm
steps:
Expand All @@ -36,15 +36,15 @@ jobs:
npm install
- run:
name: deploy
command: yarn run deploy
command: npm run deploy
- persist_to_workspace:
root: ~/
paths:
- project

create_domain:
docker:
- image: circleci/node:8.17
- image: circleci/node:18
environment:
TERM: xterm
steps:
Expand All @@ -57,7 +57,7 @@ jobs:
npm install
- run:
name: create_domain
command: yarn run create-domain
command: npm run create-domain
- persist_to_workspace:
root: ~/
paths:
Expand Down
12 changes: 8 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
FROM lambci/lambda:build-ruby2.7
FROM public.ecr.aws/lambda/ruby:3.2

RUN yum install -y postgresql postgresql-devel mysql-devel sqlite-devel
RUN yum install -y amazon-linux-extras \
&& amazon-linux-extras enable postgresql14 \
&& yum group install "Development Tools" -y

RUN yum install -y postgresql postgresql-devel mysql-devel

ADD pact_broker/Gemfile /var/task/Gemfile
ADD pact_broker/Gemfile.lock /var/task/Gemfile.lock
# ADD pact_broker/Gemfile.lock /var/task/Gemfile.lock
# hack because pg isnt pinned
RUN sed -i 's/gem "pg", "~>1.0"/gem "pg", "1.2.3"/g' /var/task/Gemfile
# RUN sed -i 's/gem "pg", "~>1.5"/gem "pg", "1.5.4"/g' /var/task/Gemfile
RUN bundle install && bundle install --deployment
42 changes: 27 additions & 15 deletions build-withpg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,45 @@ set -e
rm -rf lib && mkdir -p lib
rm -rf vendor

docker build -t ruby27-pg-builder -f Dockerfile .
docker build -t ruby32-pg-builder -f Dockerfile .

CONTAINER=$(docker run -d ruby27-pg-builder false)
CONTAINER=$(docker run -d ruby32-pg-builder false)

docker cp \
$CONTAINER:/usr/lib64/libpq.so.5.5 \
lib/libpq.so.5
docker cp \
$CONTAINER:/usr/lib64/libpq.so.5.5 lib/libpq.so.5
$CONTAINER:/usr/lib64/libpq.so.5.14 \
lib/libpq.so.5

docker cp \
$CONTAINER:/usr/lib64/libldap_r-2.4.so.2.10.7 lib/libldap_r-2.4.so.2
$CONTAINER:/usr/lib64/libldap_r-2.4.so.2.10.7 \
lib/libldap_r-2.4.so.2

docker cp \
$CONTAINER:/usr/lib64/liblber-2.4.so.2.10.7 lib/liblber-2.4.so.2
$CONTAINER:/usr/lib64/liblber-2.4.so.2.10.7 \
lib/liblber-2.4.so.2

docker cp \
$CONTAINER:/usr/lib64/libsasl2.so.3.0.0 lib/libsasl2.so.3
$CONTAINER:/usr/lib64/libsasl2.so.3.0.0 \
lib/libsasl2.so.3

docker cp \
$CONTAINER:/usr/lib64/libssl3.so lib/
$CONTAINER:/usr/lib64/libssl3.so \
lib/

docker cp \
$CONTAINER:/usr/lib64/libsmime3.so lib/
$CONTAINER:/usr/lib64/libsmime3.so \
lib/

docker cp \
$CONTAINER:/usr/lib64/libnss3.so lib/
$CONTAINER:/usr/lib64/libnss3.so \
lib/

docker cp \
$CONTAINER:/usr/lib64/libnssutil3.so lib/
$CONTAINER:/usr/lib64/libnssutil3.so \
lib/

docker cp \
$CONTAINER:/var/task/vendor \
vendor
$CONTAINER:/var/task/vendor \
vendor

docker stop $CONTAINER
docker rm $CONTAINER
4 changes: 2 additions & 2 deletions build-withpglayer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ set -e

rm -rf vendor

docker build -t ruby27-pg-builder -f Dockerfile .
docker build -t ruby32-pg-builder -f Dockerfile .

CONTAINER=$(docker run -d ruby27-pg-builder false)
CONTAINER=$(docker run -d ruby32-pg-builder false)

docker cp \
$CONTAINER:/var/task/vendor \
Expand Down
Binary file modified lib/liblber-2.4.so.2
Binary file not shown.
Binary file modified lib/libldap_r-2.4.so.2
Binary file not shown.
Binary file modified lib/libnss3.so
Binary file not shown.
Binary file modified lib/libnssutil3.so
Binary file not shown.
Binary file modified lib/libpq.so.5
Binary file not shown.
Binary file modified lib/libsasl2.so.3
Binary file not shown.
Binary file modified lib/libsmime3.so
Binary file not shown.
Binary file modified lib/libssl3.so
Binary file not shown.
Loading

0 comments on commit 1b23692

Please sign in to comment.