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

Fix: mariadb connectivity #371

Merged
merged 14 commits into from
Jan 6, 2025
Merged

Fix: mariadb connectivity #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
57f2a3e
Update Dockerfile
xirixiz Jan 3, 2025
657ee22
Update build_release.yml
xirixiz Jan 3, 2025
442e10e
Update Dockerfile
xirixiz Jan 4, 2025
f727816
Update Dockerfile
xirixiz Jan 4, 2025
86f1a74
Update Dockerfile
xirixiz Jan 6, 2025
13ed9e2
Update Dockerfile
xirixiz Jan 6, 2025
8a5f719
Update Dockerfile
xirixiz Jan 6, 2025
52cc845
Update Dockerfile
xirixiz Jan 6, 2025
faca211
Update Dockerfile
xirixiz Jan 6, 2025
4aec070
Update Dockerfile
xirixiz Jan 6, 2025
b9af308
Update Dockerfile
xirixiz Jan 6, 2025
c7958e1
Update Dockerfile
xirixiz Jan 6, 2025
5d25701
Update Dockerfile
xirixiz Jan 6, 2025
f759027
Update Dockerfile
xirixiz Jan 6, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/build_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:
env:
DOCKER_TARGET_REPO: xirixiz/dsmr-reader-docker
DOCKERFILE: Dockerfile
DOCKER_TARGET_RELEASE: 2025.01.01
DOCKER_TARGET_RELEASE: 2025.01.02

jobs:
################################################
Expand Down
12 changes: 8 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ FROM python:3.11-alpine3.21 as base
# Build arguments
ARG DSMR_VERSION
ENV DSMR_VERSION=${DSMR_VERSION}
ENV LD_LIBRARY_PATH=/usr/lib:/usr/local/lib:$LD_LIBRARY_PATH

# Algemene omgevingsvariabelen
ENV PS1="$(whoami)@dsmr_reader_docker:$(pwd)\\$ " \
Expand Down Expand Up @@ -53,13 +54,16 @@ COPY --from=staging /app /app

RUN apk add --no-cache \
bash curl coreutils ca-certificates shadow jq nginx \
openssl postgresql17-client libjpeg-turbo tzdata s6-overlay \
openssl postgresql17-client tzdata \
s6-overlay netcat-openbsd dpkg \
libffi jpeg libjpeg-turbo libpng zlib mariadb-connector-c-dev \
&& echo "**** install build dependencies and pip packages ****" \
&& apk add --no-cache --virtual .build-deps \
gcc python3-dev musl-dev postgresql17-dev build-base \
libffi-dev jpeg-dev rust cargo mariadb-dev \
gcc python3-dev musl-dev postgresql17-dev build-base rust cargo \
libffi-dev jpeg-dev libjpeg-turbo-dev libpng-dev zlib-dev mariadb-dev \
&& python3 -m pip install --no-cache-dir --upgrade pip \
&& python3 -m pip install --no-cache-dir -r /app/dsmrreader/provisioning/requirements/base.txt \
&& python3 -m pip install --no-cache-dir mysqlclient tzupdate \
&& python3 -m pip install --no-cache-dir tzupdate mysqlclient \
&& echo "**** cleanup ****" \
&& apk del .build-deps \
&& rm -rf /var/cache/apk/* /tmp/* /root/.cache
Expand Down
Loading