Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 13 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,22 @@ jobs:

- name: Test
if: ${{ !cancelled() && steps.auto_install_upgrade.conclusion == 'success' }}
# The auto-install script installs docker-openwisp by default in
# /opt/openwisp/docker-openwisp. To ensure the test runs correctly
# and environment variables remain intact, it is essential to
# execute the test from this directory.
run: |
(make develop-pythontests && make stop) || (docker compose logs && exit 1)
working-directory: /opt/openwisp/docker-openwisp
uses: openwisp/openwisp-utils/.github/actions/retry-command@master
with:
delay_seconds: 30
max_attempts: 5
# The auto-install script installs docker-openwisp by default in
# /opt/openwisp/docker-openwisp. To ensure the test runs correctly
# and environment variables remain intact, it is essential to
# execute the test from this directory.
command: cd /opt/openwisp/docker-openwisp && make develop-pythontests && make stop
env:
SELENIUM_HEADLESS: 1

- name: Print docker logs
if: ${{ failure() }}
run: docker compose logs

# the following action is equivalent to
# echo "$DOCKER_HUB_SECRET" | docker login --username "$DOCKER_HUB_USERNAME" --password-stdin
- name: Login to Docker Hub
Expand Down
6 changes: 3 additions & 3 deletions images/openwisp_nfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM alpine:3.20
FROM alpine:3.21

# hadolint ignore=DL3018
RUN apk add --no-cache --update --verbose \
tzdata~=2024b-r0 \
nfs-utils~=2.6.4-r1 && \
tzdata~=2025b-r0 \
nfs-utils~=2.6.4-r3 && \
rm -rf /var/cache/apk/* /tmp/*

COPY ./openwisp_nfs/init_command.sh /init_command.sh
Expand Down
10 changes: 5 additions & 5 deletions images/openwisp_nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM nginx:1.27.3-alpine
FROM nginx:1.27.4-alpine

RUN apk add --update --no-cache \
openssl~=3.3.2-r1 \
py3-pip~=24.0-r2 \
certbot~=2.10.0-r1 \
certbot-nginx~=2.10.0-r1 && \
openssl~=3.3.3-r0 \
py3-pip~=24.3.1-r0 \
certbot~=3.0.1-r0 \
certbot-nginx~=3.0.1-r0 && \
rm -rf /var/cache/apk/* /tmp/*

WORKDIR /etc/nginx/
Expand Down
14 changes: 7 additions & 7 deletions images/openwisp_postfix/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM alpine:3.20
FROM alpine:3.21

WORKDIR /opt/openwisp/
RUN apk add --no-cache --upgrade \
openssl~=3.3.2-r1 \
cyrus-sasl~=2.1.28-r6 \
cyrus-sasl-login~=2.1.28-r6 && \
openssl~=3.3.3-r0 \
cyrus-sasl~=2.1.28-r8 \
cyrus-sasl-login~=2.1.28-r8 && \
apk add --no-cache \
postfix~=3.9.1-r0 \
rsyslog~=8.2404.0-r0 \
tzdata~=2024b-r0 && \
postfix~=3.9.3-r0 \
rsyslog~=8.2410.0-r0 \
tzdata~=2025b-r0 && \
rm -rf /tmp/* /var/cache/apk/*

CMD ["sh", "init_command.sh"]
Expand Down
2 changes: 1 addition & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
docker~=7.1.0
openwisp-utils[qa,selenium]~=1.1.1
openwisp-utils[qa,selenium] @ https://github.com/openwisp/openwisp-utils/tarball/1.2
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

After merging the PR on openwisp-utils and updating this line the build failed, maybe the github action reference needs to be updated too?

Loading