Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #368

Merged
merged 8 commits into from
Dec 30, 2024
Merged

Development #368

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cf02515
Update Dockerfile
xirixiz Dec 30, 2024
126cb13
Update Dockerfile
xirixiz Dec 30, 2024
e6bdeec
Update Dockerfile
xirixiz Dec 30, 2024
5656291
Update Dockerfile
xirixiz Dec 30, 2024
e8de4a6
Update Dockerfile
xirixiz Dec 30, 2024
25bc294
Update Dockerfile
xirixiz Dec 30, 2024
95899ed
Update Dockerfile
xirixiz Dec 30, 2024
68330a4
Update Dockerfile
xirixiz Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# STAGING STEP
#---------------------------------------------------------------------------------------------------------------------------

FROM --platform=$BUILDPLATFORM python:3.13-alpine3.21 as staging
FROM --platform=$BUILDPLATFORM python:3.12-alpine3.21 as staging
WORKDIR /app

ARG DSMR_VERSION
Expand All @@ -16,7 +16,7 @@ RUN echo "**** Download DSMR ****" \
#---------------------------------------------------------------------------------------------------------------------------
# BUILD STEP
#---------------------------------------------------------------------------------------------------------------------------
FROM python:3.13-alpine3.21 as base
FROM python:3.12-alpine3.21 as base

# Build the binary according to the TARGET platform variables
ARG TARGETARCH
Expand Down Expand Up @@ -73,7 +73,7 @@ RUN echo "**** install runtime packages ****" \
nginx \
openssl \
netcat-openbsd \
postgresql16-client \
postgresql17-client \
mariadb-connector-c-dev \
mariadb-client \
libjpeg-turbo \
Expand All @@ -97,11 +97,9 @@ RUN echo "**** install s6 overlay ****" \
&& rm -rf /tmp/s6-overlay-*.tar.xz

RUN echo "**** install build packages ****" \
&& apk add --no-cache --virtual .build-deps gcc python3-dev musl-dev postgresql-dev build-base mariadb-dev libffi-dev jpeg-dev cargo rust \
&& apk add --no-cache --virtual .build-deps gcc python3-dev musl-dev postgresql17-dev build-base mariadb-dev libpq-dev libffi-dev jpeg-dev cargo rust \
&& echo "**** install pip packages ****" \
&& python3 -m pip install "cython<3.0.0" --no-cache-dir \
&& python3 -m pip install -r /app/dsmrreader/provisioning/requirements/base.txt --no-cache-dir \
&& python3 -m pip install psycopg2 --no-cache-dir \
&& python3 -m pip install mysqlclient --no-cache-dir \
&& python3 -m pip install tzupdate --no-cache-dir \
&& echo "**** create app user and make base folders ****" \
Expand Down
Loading