Skip to content

Commit 3e96bbb

Browse files
authored
Merge pull request #228 from grillazz/docker-image-refactor
Docker image refactor
2 parents 35a514b + 83138b3 commit 3e96bbb

File tree

2 files changed

+7
-22
lines changed

2 files changed

+7
-22
lines changed

.github/workflows/build-and-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
ports:
3535
- 6379:6379
3636
sqldb:
37-
image: postgres:16
37+
image: postgres:17
3838
env:
3939
POSTGRES_USER: panettone
4040
POSTGRES_PASSWORD: secret
@@ -45,12 +45,12 @@ jobs:
4545
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
4646

4747
steps:
48-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v5
4949
- name: Create database schema
5050
run: PGPASSWORD=secret psql -h 127.0.0.1 -d testdb -U panettone -c "CREATE SCHEMA shakespeare; CREATE SCHEMA happy_hog;"
5151

52-
- name: Install the latest version of uv and set the python version
53-
uses: astral-sh/setup-uv@v5
52+
- name: Install the latest version of uv
53+
uses: astral-sh/setup-uv@v7
5454
with:
5555
python-version: ${{ matrix.python-version }}
5656

Dockerfile

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
FROM ubuntu:25.10 AS base
1+
FROM python:3.14-slim AS base
22

33
RUN apt-get update -qy \
44
&& apt-get install -qyy \
55
-o APT::Install-Recommends=false \
66
-o APT::Install-Suggests=false \
77
build-essential \
8-
ca-certificates \
9-
python3-setuptools \
10-
python3.14-dev
11-
8+
ca-certificates
129

1310
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
1411

@@ -22,25 +19,13 @@ COPY uv.lock /_lock/
2219

2320
RUN cd /_lock && uv sync --locked --no-install-project
2421
##########################################################################
25-
FROM ubuntu:25.10
22+
FROM python:3.14-slim
2623

2724
ENV PATH=/panettone/bin:$PATH
2825

2926
RUN groupadd -r panettone
3027
RUN useradd -r -d /panettone -g panettone -N panettone
3128

32-
STOPSIGNAL SIGINT
33-
34-
RUN apt-get update -qy && apt-get install -qyy \
35-
-o APT::Install-Recommends=false \
36-
-o APT::Install-Suggests=false \
37-
python3.14 \
38-
libpython3.14 \
39-
libpcre3
40-
41-
RUN apt-get clean
42-
RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
43-
4429
COPY --from=base --chown=panettone:panettone /panettone /panettone
4530

4631
USER panettone

0 commit comments

Comments
 (0)