From 5d5b01f6b5b425211de84ddeb609adb058289b0f Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Thu, 6 Apr 2023 09:52:28 +0200 Subject: [PATCH 1/2] Fixed version conflicts for social-auth-core --- Dockerfile | 9 +++++++-- requirements-container.txt | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 56ba2d3..0e6e32c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \ libsasl2-dev \ libssl-dev \ libxml2-dev \ - libxml2-dev \ libxmlsec1 \ libxmlsec1-dev \ libxmlsec1-openssl \ @@ -31,7 +30,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ ARG NETBOX_PATH COPY ${NETBOX_PATH}/requirements.txt requirements-container.txt / -RUN sed -i -e '/psycopg2-binary/d' requirements.txt && \ +RUN sed -i -e '/psycopg2-binary/d' /requirements.txt && \ + # We need 'social-auth-core[all]' in the Docker image. But if we put it in our own requirements-container.txt + # we have potential version conflicts and the build will fail. + # That's why we just replace it in the original requirements.txt. + sed -i -e 's/social-auth-core\[openidconnect\]/social-auth-core\[all\]/g' /requirements.txt && \ /opt/netbox/venv/bin/pip install \ -r /requirements.txt \ -r /requirements-container.txt @@ -74,6 +77,8 @@ COPY --from=builder /opt/netbox/venv /opt/netbox/venv ARG NETBOX_PATH COPY ${NETBOX_PATH} /opt/netbox +# Copy the modified 'requirements*.txt' files, to have the files actually used to install +COPY --from=builder /requirements.txt /requirements-container.txt /opt/netbox/ COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py COPY docker/ldap_config.docker.py /opt/netbox/netbox/netbox/ldap_config.py diff --git a/requirements-container.txt b/requirements-container.txt index 2701f23..2fd446a 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,3 @@ django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.13.2 napalm==4.0.0 psycopg2==2.9.6 python3-saml==1.15.0 -social-auth-core[all]==4.4.0 From 5a29364bca994e620d777ef7dd90c548b3f91bdd Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Thu, 6 Apr 2023 11:08:34 +0200 Subject: [PATCH 2/2] Fixed wording MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Christian Mäder --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0e6e32c..60589c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,7 +77,7 @@ COPY --from=builder /opt/netbox/venv /opt/netbox/venv ARG NETBOX_PATH COPY ${NETBOX_PATH} /opt/netbox -# Copy the modified 'requirements*.txt' files, to have the files actually used to install +# Copy the modified 'requirements*.txt' files, to have the files actually used during installation COPY --from=builder /requirements.txt /requirements-container.txt /opt/netbox/ COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py