Skip to content

Commit

Permalink
[change] Updated openwisp modules, base images, django (4.2) and post…
Browse files Browse the repository at this point in the history
…gres (12)
  • Loading branch information
nemesifier committed Apr 23, 2024
1 parent efbda73 commit 24e2312
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 20 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ jobs:
uses: actions/checkout@v2

- name: Install Testing Requirements
run: sudo pip install -r requirements-test.txt
run: |
sudo pip install -U pip setuptools wheel
sudo pip install -r requirements-test.txt
- name: Lint
run: openwisp-qa-check --skip-checkmigrations
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ services:
- NET_ADMIN

postgres:
image: mdillon/postgis:11-alpine
image: postgis/postgis:12-3.4
restart: always
environment:
- POSTGRES_DB=$DB_NAME
Expand Down
18 changes: 9 additions & 9 deletions images/openwisp_base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ FROM system AS openwisp_python
ENV PATH="${PATH}:/home/openwisp/.local/bin"
ENV PYTHONPATH=/home/openwisp/.local/lib/python3.10/site-packages

RUN pip install --no-cache-dir --user --upgrade pip~=23.0.1
RUN pip install --no-cache-dir --user --upgrade pip~=24.0.0
# TODO: Remove when next version of openwisp-monitoring is released
ARG OPENWISP_MONITORING_SOURCE=https://github.com/openwisp/openwisp-monitoring/tarball/15977c74b48d846ac469316abc7f13ccbef405f0
ARG OPENWISP_MONITORING_SOURCE=https://github.com/openwisp/openwisp-monitoring/tarball/18cc5249de1f057554826f9d6e6ed8683e3f24bc
# hadolint ignore=DL3013
RUN pip install --no-cache-dir --user --upgrade ${OPENWISP_MONITORING_SOURCE}
ARG OPENWISP_FIRMWARE_SOURCE=https://github.com/openwisp/openwisp-firmware-upgrader/tarball/9c7840c7436eb8b8cd5a63e83194041ccf887cd2
ARG OPENWISP_FIRMWARE_SOURCE=https://github.com/openwisp/openwisp-firmware-upgrader/tarball/5a104a8f06fd566b9c09dddb93005f223df0bb47
# hadolint ignore=DL3013
RUN pip install --no-cache-dir --user --upgrade ${OPENWISP_FIRMWARE_SOURCE}
ARG OPENWISP_TOPOLOGY_SOURCE=https://github.com/openwisp/openwisp-network-topology/tarball/ade4d5f844753879ccb54cce1d3528f17c55a490
ARG OPENWISP_TOPOLOGY_SOURCE=https://github.com/openwisp/openwisp-network-topology/tarball/d150127e6ee244b2c25aa2d35f804d3d1124bde4
# hadolint ignore=DL3013
RUN pip install --no-cache-dir --user --upgrade ${OPENWISP_TOPOLOGY_SOURCE}
ARG OPENWISP_RADIUS_SOURCE=https://github.com/openwisp/openwisp-radius/tarball/1a748466c269df3548557d9d42df6bb886da4f57
ARG OPENWISP_RADIUS_SOURCE=https://github.com/openwisp/openwisp-radius/tarball/6a2d98861a8d43e7622d87f7e1af97503c2677f9
# hadolint ignore=DL3013
RUN pip install --no-cache-dir --user --upgrade ${OPENWISP_RADIUS_SOURCE}

Expand All @@ -49,7 +49,7 @@ RUN if [ "$OPENWISP_IPAM_SOURCE" != "default" ] ; then \
pip install --no-cache-dir --user --upgrade ${OPENWISP_IPAM_SOURCE}; \
fi
# TODO: Remove when next version of openwisp-controller is released
ARG OPENWISP_CONTROLLER_SOURCE=https://github.com/openwisp/openwisp-controller/tarball/3383bc11e5f8e9c89ebd9ac8aefa0066576d3133
ARG OPENWISP_CONTROLLER_SOURCE=https://github.com/openwisp/openwisp-controller/tarball/1e641fe094838178556b4db09317065bd28c625c
# hadolint ignore=DL3013
RUN if [ "$OPENWISP_CONTROLLER_SOURCE" != "default" ] ; then \
pip install --no-cache-dir --user --upgrade ${OPENWISP_CONTROLLER_SOURCE}; \
Expand All @@ -59,13 +59,13 @@ ARG OPENWISP_NOTIFICATION_SOURCE=default
RUN if [ "$OPENWISP_NOTIFICATION_SOURCE" != "default" ] ; then \
pip install --no-cache-dir --user --upgrade ${OPENWISP_NOTIFICATION_SOURCE}; \
fi
ARG OPENWISP_USERS_SOURCE=https://github.com/openwisp/openwisp-users/tarball/55023698cf39711585480be90c98d64ce5a04b8d
ARG OPENWISP_USERS_SOURCE=https://github.com/openwisp/openwisp-users/tarball/8a39e488b0b955c7322f6df7927d2adb71ce7caf
# hadolint ignore=DL3013
RUN if [ "$OPENWISP_USERS_SOURCE" != "default" ] ; then \
pip install --no-cache-dir --user --upgrade --force-reinstall ${OPENWISP_USERS_SOURCE}; \
fi
# TODO: Remove when next version of openwisp-utils is released
ARG OPENWISP_UTILS_SOURCE="openwisp-utils[celery,rest] @ https://github.com/openwisp/openwisp-utils/tarball/9fd347fb861af674674a4bcc59c54bcdeef18b8c "
ARG OPENWISP_UTILS_SOURCE="openwisp-utils[celery,rest] @ https://github.com/openwisp/openwisp-utils/tarball/1d3b00cbd8b36686a39b3f24c42667e6482197b2"
# hadolint ignore=DL3013
RUN if [ "$OPENWISP_UTILS_SOURCE" != "default" ] ; then \
pip install --no-cache-dir --user --upgrade --force-reinstall "${OPENWISP_UTILS_SOURCE}"; \
Expand All @@ -76,7 +76,7 @@ RUN if [ "$DJANGO_X509_SOURCE" != "default" ]; then \
pip install --no-cache-dir --user --upgrade --force-reinstall ${DJANGO_X509_SOURCE}; \
fi

ARG DJANGO_SOURCE=django~=4.0.10
ARG DJANGO_SOURCE=django~=4.2.0
# hadolint ignore=DL3013
RUN pip install --no-cache-dir --user --upgrade ${DJANGO_SOURCE}

Expand Down
4 changes: 2 additions & 2 deletions images/openwisp_freeradius/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM freeradius/freeradius-server:3.0.26-alpine

# hadolint ignore=DL3018
RUN apk add --no-cache --update tzdata~=2022f-r1 postgresql-dev~=13.8-r0 \
postgresql-client~=13.8-r0 && \
RUN apk add --no-cache --update tzdata~=2022f-r1 \
postgresql-client~=13.12-r0 && \
rm -rf /var/cache/apk/* /tmp/*

RUN addgroup -S freerad && \
Expand Down
2 changes: 1 addition & 1 deletion images/openwisp_nfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM alpine:3.16

# hadolint ignore=DL3018
RUN apk add --no-cache --update --verbose \
tzdata~=2022f-r1 \
tzdata~=2024a-r0 \
nfs-utils~=2.6.1-r1 && \
rm -rf /var/cache/apk/* /tmp/*

Expand Down
2 changes: 1 addition & 1 deletion images/openwisp_nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM nginx:1.23.3-alpine

RUN apk add --update --no-cache \
openssl~=3.0.8-r0 \
openssl~=3.0.12-r5 \
certbot~=1.32.0-r0 \
certbot-nginx~=1.32.0-r0 && \
rm -rf /var/cache/apk/* /tmp/*
Expand Down
6 changes: 3 additions & 3 deletions images/openwisp_postfix/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ FROM alpine:3.16

WORKDIR /opt/openwisp/
RUN apk add --no-cache --upgrade \
openssl~=1.1.1t-r0 \
openssl~=1.1.1w-r1 \
cyrus-sasl~=2.1.28-r1 \
cyrus-sasl-login~=2.1.28-r1 && \
apk add --no-cache \
postfix~=3.7.3-r0 \
postfix~=3.7.11-r0 \
rsyslog~=8.2204.1-r0 \
tzdata~=2022f-r1 && \
tzdata~=2024a-r0 && \
rm -rf /tmp/* /var/cache/apk/*

CMD ["sh", "init_command.sh"]
Expand Down
3 changes: 1 addition & 2 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
docker~=5.0.3
selenium~=4.1.0
openwisp-utils[qa] @ https://github.com/openwisp/openwisp-utils/tarball/master
openwisp-utils[qa,selenium] @ https://github.com/openwisp/openwisp-utils/tarball/master

0 comments on commit 24e2312

Please sign in to comment.