Skip to content

Commit c7c994a

Browse files
committed
[fix] Pin topology/monitoring/radius to 1.3 to match utils, fixing CI #623
a95eadf bumped utils and controller to the 1.3 family but left OPENWISP_TOPOLOGY/MONITORING/RADIUS_SOURCE on ~=1.2.0. network-topology 1.2's admin.py imports UUIDAdmin, which openwisp-utils 1.3 removed, so daphne crashed on import during admin autodiscover and CI failed. CI reads the Dockerfile defaults (.build.env is gitignored), so the pin must live here. Pin the whole openwisp 1.3 family to fixed commit SHAs so the build is consistent and reproducible. Temporary for PR #436 compat; revert with the rest of the 1.3 pins before merge. Related to #623
1 parent 90afffa commit c7c994a

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

images/openwisp_base/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ ENV PATH="${PATH}:/home/openwisp/.local/bin"
3030

3131
# hadolint ignore=DL3013
3232
RUN pip install --no-cache-dir --user --upgrade pip setuptools wheel
33-
ARG OPENWISP_MONITORING_SOURCE="openwisp-monitoring~=1.2.0"
33+
ARG OPENWISP_MONITORING_SOURCE="https://github.com/openwisp/openwisp-monitoring/archive/584b29db6b8ee2657cdb14722c3b129afe9a417f.tar.gz"
3434
# hadolint ignore=DL3013
3535
RUN pip install --no-cache-dir --user --upgrade ${OPENWISP_MONITORING_SOURCE}
3636
ARG OPENWISP_FIRMWARE_SOURCE="https://github.com/openwisp/openwisp-firmware-upgrader/tarball/issues/417-persistence-schema-fields"
3737
# hadolint ignore=DL3013
3838
RUN pip install --no-cache-dir --user --upgrade ${OPENWISP_FIRMWARE_SOURCE}
39-
ARG OPENWISP_TOPOLOGY_SOURCE="openwisp-network-topology~=1.2.0"
39+
ARG OPENWISP_TOPOLOGY_SOURCE="https://github.com/openwisp/openwisp-network-topology/archive/2f23a6c8a16af19643f1abba67d436da349be3e6.tar.gz"
4040
# hadolint ignore=DL3013
4141
RUN pip install --no-cache-dir --user --upgrade ${OPENWISP_TOPOLOGY_SOURCE}
42-
ARG OPENWISP_RADIUS_SOURCE="openwisp-radius~=1.2.0"
42+
ARG OPENWISP_RADIUS_SOURCE="https://github.com/openwisp/openwisp-radius/archive/cd6a22b1d27a1b99b7155a120556e370fea98bfd.tar.gz"
4343
# hadolint ignore=DL3013
4444
RUN pip install --no-cache-dir --user --upgrade ${OPENWISP_RADIUS_SOURCE}
4545

@@ -51,7 +51,7 @@ ARG OPENWISP_IPAM_SOURCE="https://github.com/openwisp/openwisp-ipam/archive/refs
5151
RUN if [ "$OPENWISP_IPAM_SOURCE" != "default" ] ; then \
5252
pip install --no-cache-dir --user --upgrade ${OPENWISP_IPAM_SOURCE}; \
5353
fi
54-
ARG OPENWISP_CONTROLLER_SOURCE="https://github.com/openwisp/openwisp-controller/archive/refs/heads/1.3.tar.gz"
54+
ARG OPENWISP_CONTROLLER_SOURCE="https://github.com/openwisp/openwisp-controller/archive/e0ee749e22c7fa1445d8ce9ad1d289c08ce74feb.tar.gz"
5555
# hadolint ignore=DL3013
5656
RUN if [ "$OPENWISP_CONTROLLER_SOURCE" != "default" ] ; then \
5757
pip install --no-cache-dir --user --upgrade ${OPENWISP_CONTROLLER_SOURCE}; \
@@ -66,7 +66,7 @@ ARG OPENWISP_USERS_SOURCE="https://github.com/openwisp/openwisp-users/archive/re
6666
RUN if [ "$OPENWISP_USERS_SOURCE" != "default" ] ; then \
6767
pip install --no-cache-dir --user --upgrade --force-reinstall ${OPENWISP_USERS_SOURCE}; \
6868
fi
69-
ARG OPENWISP_UTILS_SOURCE="https://github.com/openwisp/openwisp-utils/archive/refs/heads/1.3.tar.gz"
69+
ARG OPENWISP_UTILS_SOURCE="https://github.com/openwisp/openwisp-utils/archive/764ea4917c2b52cddbf2e45ff9c67ac6e4c87261.tar.gz"
7070
# hadolint ignore=DL3013
7171
RUN if [ "$OPENWISP_UTILS_SOURCE" != "default" ] ; then \
7272
pip install --no-cache-dir --user --upgrade --force-reinstall "${OPENWISP_UTILS_SOURCE}"; \

0 commit comments

Comments
 (0)