diff --git a/Dockerfile b/Dockerfile index 56ba2d3..60589c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,6 @@ libsasl2-dev \ libssl-dev \ libxml2-dev \ - libxml2-dev \ libxmlsec1 \ libxmlsec1-dev \ libxmlsec1-openssl \ @@ -31,7 +30,11 @@ 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 @@ ARG NETBOX_PATH COPY ${NETBOX_PATH} /opt/netbox +# 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 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 @@ napalm==4.0.0 psycopg2==2.9.6 python3-saml==1.15.0 -social-auth-core[all]==4.4.0