Skip to content

Commit cbba0ad

Browse files
authored
Merge pull request #302 from RockefellerArchiveCenter/development
Update base image
2 parents 2aa2c4f + 39690e0 commit cbba0ad

File tree

5 files changed

+22
-16
lines changed

5 files changed

+22
-16
lines changed

.github/workflows/dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Python
2323
uses: actions/setup-python@v6.0.0
2424
with:
25-
python-version: '3.11'
25+
python-version: '3.12'
2626
cache: pip
2727

2828
- name: Install pre-commit and pip-tools

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ repos:
66
args:
77
- --in-place
88
- --aggressive
9+
- --max-line-length=100
910
- repo: https://github.com/pycqa/flake8
1011
rev: 7.3.0
1112
hooks:

Dockerfile

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1-
FROM public.ecr.aws/lambda/python:3.11
1+
FROM public.ecr.aws/lambda/python:3.12
22

3-
ENV RUBY_VERSION=3.2.4
3+
# Install system packages
4+
RUN dnf -y update && \
5+
dnf -y install \
6+
gcc gcc-c++ make \
7+
autoconf automake bison libtool patch \
8+
tar gzip bzip2 xz \
9+
git which procps-ng findutils ca-certificates \
10+
ruby ruby-devel rubygems \
11+
openssl-devel readline-devel zlib-devel libyaml-devel libffi-devel \
12+
gdbm-devel ncurses-devel sqlite-devel && \
13+
dnf clean all && rm -rf /var/cache/dnf
414

5-
RUN yum update -y && yum install -y \
6-
make gcc curl gpg which tar procps wget \
7-
git
8-
9-
# Install RVM and use RVM to install desired version of Ruby
10-
RUN \curl -L https://get.rvm.io | bash
11-
RUN /bin/bash -l -c "rvm requirements"
12-
RUN /bin/bash -l -c "rvm install $RUBY_VERSION"
13-
RUN /bin/bash -l -c "gem install bundler --no-document"
14-
RUN /bin/bash -l -c "gem install jekyll --no-document"
15+
# Install Ruby gems
16+
RUN gem update --system && \
17+
gem install bundler --no-document && \
18+
gem install jekyll --no-document
1519

20+
# Install Python dependencies
1621
ADD requirements.txt ${LAMBDA_TASK_ROOT}
1722
RUN pip install -r requirements.txt --target "${LAMBDA_TASK_ROOT}"
1823

Dockerfile-local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11
1+
FROM python:3.12
22

33
ENV RUBY_VERSION=3.2.4
44
ENV CONTAINER_ROOT=/home/docs/docs-build/

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
boto3==1.40.42
1+
boto3==1.40.53
22
# via -r requirements.in
3-
botocore==1.40.42
3+
botocore==1.40.53
44
# via
55
# boto3
66
# s3transfer

0 commit comments

Comments
 (0)