Skip to content

Fix Pydantic error in API #188

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

Open
edeckers wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Pydantic error in API #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 10 additions & 0 deletions api/21-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,23 @@ LABEL org.label-schema.schema-version="1.0" \

RUN pip install --no-cache-dir --upgrade pip==22.0.4

# Required for installation of Python sslpsk package
RUN apk add build-base openssl-dev
Copy link
Contributor

@FlorentPoinsaut FlorentPoinsaut Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
RUN apk add build-base openssl-dev
RUN apk add --no-cache build-base openssl-dev


RUN adduser -D bareos
USER bareos
WORKDIR /home/bareos

ENV PATH="/home/bareos/.local/bin:${PATH}"
RUN pip install --no-cache-dir "bareos-restapi>=21*,<22*"

# Pin pydantic to 1.x version to circumvent
# https://github.com/barcus/bareos/issues/187
RUN pip install --no-cache-dir "pydantic==1.10.21"

# Support connection encryption via TLS-PSK
RUN pip install --no-cache-dir "sslpsk"

Copy link
Contributor

@FlorentPoinsaut FlorentPoinsaut Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
USER root
RUN apk del build-base openssl-dev
USER bareos

COPY --chown=bareos docker-entrypoint.sh /docker-entrypoint.sh
RUN chmod a+x /docker-entrypoint.sh

Expand Down
10 changes: 10 additions & 0 deletions api/22-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,23 @@ LABEL org.label-schema.schema-version="1.0" \

RUN pip install --no-cache-dir --upgrade pip==22.0.4

# Required for installation of Python sslpsk package
RUN apk add build-base openssl-dev
Copy link
Contributor

@FlorentPoinsaut FlorentPoinsaut Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
RUN apk add build-base openssl-dev
RUN apk add --no-cache build-base openssl-dev


RUN adduser -D bareos
USER bareos
WORKDIR /home/bareos

ENV PATH="/home/bareos/.local/bin:${PATH}"
RUN pip install --no-cache-dir "bareos-restapi>=22*,<23*"

# Pin pydantic to 1.x version to circumvent
# https://github.com/barcus/bareos/issues/187
RUN pip install --no-cache-dir "pydantic==1.10.21"

# Support connection encryption via TLS-PSK
RUN pip install --no-cache-dir "sslpsk"

Copy link
Contributor

@FlorentPoinsaut FlorentPoinsaut Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
USER root
RUN apk del build-base openssl-dev
USER bareos

COPY --chown=bareos docker-entrypoint.sh /docker-entrypoint.sh
RUN chmod a+x /docker-entrypoint.sh

Expand Down