Skip to content

Commit 6e3e6b1

Browse files
dependabot[bot]pandafynemesifier
authored
[deps] Upgraded dependencies and base images
* [deps] Bump alpine from 3.20 to 3.21 in /images/openwisp_postfix Bumps alpine from 3.20 to 3.21. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * [deps] Upgraded system packages in postfix Dockerfile * [deps] Bump nginx in /images/openwisp_nginx Bumps nginx from 1.27.3-alpine to 1.27.4-alpine. --- updated-dependencies: - dependency-name: nginx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * [deps] Upgraded system packages in nginx Dockerfile * [deps] Bump alpine from 3.20 to 3.21 in /images/openwisp_nfs Bumps alpine from 3.20 to 3.21. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * [deps] Upgraded system packages in openwisp_nfs Dockerfile * [tests] Updated selenium tests * [chores] Made quoting style consistent * [tests] Fixed failing tests * [test-deps] Update requirements-test.txt * [deps] Upgraded tz_data package * [ci] Display docker compose logs in separate step * [temp] Upgraded openwisp-utils * [ci] Retry running test suite on failure * [tests] Added sleep after login in tests * [tests] Print browser console errors * [chores] Update requirements-test.txt * [ci] Updated retry-command action reference --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gagan Deep <[email protected]> Co-authored-by: Federico Capoano <[email protected]>
1 parent 555500e commit 6e3e6b1

File tree

7 files changed

+219
-277
lines changed

7 files changed

+219
-277
lines changed

.github/workflows/ci.yml

+13-7
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,22 @@ jobs:
7272
7373
- name: Test
7474
if: ${{ !cancelled() && steps.auto_install_upgrade.conclusion == 'success' }}
75-
# The auto-install script installs docker-openwisp by default in
76-
# /opt/openwisp/docker-openwisp. To ensure the test runs correctly
77-
# and environment variables remain intact, it is essential to
78-
# execute the test from this directory.
79-
run: |
80-
(make develop-pythontests && make stop) || (docker compose logs && exit 1)
81-
working-directory: /opt/openwisp/docker-openwisp
75+
uses: openwisp/openwisp-utils/.github/actions/retry-command@master
76+
with:
77+
delay_seconds: 30
78+
max_attempts: 5
79+
# The auto-install script installs docker-openwisp by default in
80+
# /opt/openwisp/docker-openwisp. To ensure the test runs correctly
81+
# and environment variables remain intact, it is essential to
82+
# execute the test from this directory.
83+
command: cd /opt/openwisp/docker-openwisp && make develop-pythontests && make stop
8284
env:
8385
SELENIUM_HEADLESS: 1
8486

87+
- name: Print docker logs
88+
if: ${{ failure() }}
89+
run: docker compose logs
90+
8591
# the following action is equivalent to
8692
# echo "$DOCKER_HUB_SECRET" | docker login --username "$DOCKER_HUB_USERNAME" --password-stdin
8793
- name: Login to Docker Hub

images/openwisp_nfs/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM alpine:3.20
1+
FROM alpine:3.21
22

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

99
COPY ./openwisp_nfs/init_command.sh /init_command.sh

images/openwisp_nginx/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM nginx:1.27.3-alpine
1+
FROM nginx:1.27.4-alpine
22

33
RUN apk add --update --no-cache \
4-
openssl~=3.3.2-r1 \
5-
py3-pip~=24.0-r2 \
6-
certbot~=2.10.0-r1 \
7-
certbot-nginx~=2.10.0-r1 && \
4+
openssl~=3.3.3-r0 \
5+
py3-pip~=24.3.1-r0 \
6+
certbot~=3.0.1-r0 \
7+
certbot-nginx~=3.0.1-r0 && \
88
rm -rf /var/cache/apk/* /tmp/*
99

1010
WORKDIR /etc/nginx/

images/openwisp_postfix/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
FROM alpine:3.20
1+
FROM alpine:3.21
22

33
WORKDIR /opt/openwisp/
44
RUN apk add --no-cache --upgrade \
5-
openssl~=3.3.2-r1 \
6-
cyrus-sasl~=2.1.28-r6 \
7-
cyrus-sasl-login~=2.1.28-r6 && \
5+
openssl~=3.3.3-r0 \
6+
cyrus-sasl~=2.1.28-r8 \
7+
cyrus-sasl-login~=2.1.28-r8 && \
88
apk add --no-cache \
9-
postfix~=3.9.1-r0 \
10-
rsyslog~=8.2404.0-r0 \
11-
tzdata~=2024b-r0 && \
9+
postfix~=3.9.3-r0 \
10+
rsyslog~=8.2410.0-r0 \
11+
tzdata~=2025b-r0 && \
1212
rm -rf /tmp/* /var/cache/apk/*
1313

1414
CMD ["sh", "init_command.sh"]

requirements-test.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
docker~=7.1.0
2-
openwisp-utils[qa,selenium]~=1.1.1
2+
openwisp-utils[qa,selenium] @ https://github.com/openwisp/openwisp-utils/tarball/1.2

0 commit comments

Comments
 (0)