Skip to content

Commit d73557d

Browse files
authored
Fix the docker setup for the integration tests (#423)
1 parent 254cac8 commit d73557d

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2492,7 +2492,7 @@ It no ACME test server was detected, most of the tests will be skipped.
24922492
You can test the module with docker:
24932493

24942494
```
2495-
> make test-docker
2495+
> make docker-test
24962496
```
24972497

24982498
This creates a Debian sid image and installs the current apache2 package and Pebble. It copies and

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.7'
22
services:
33
debian-sid:
44
# build and run tests in a debian sid container
5-
image: ${DOCKER_REGISTRY}/mod-md-debian-sid:0.0.1
5+
image: mod-md-debian-sid:0.0.1
66
container_name: mod-md-debian-sid
77
build:
88
context: .

docker/debian-sid/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ RUN apt install -y apt-listchanges \
55
make openssl libssl-dev libcurl4 libcurl4-openssl-dev \
66
gcc subversion git cargo python3 iputils-ping \
77
libapr1-dev libaprutil1-dev libnghttp2-dev pip \
8-
autoconf libtool libtool-bin libpcre3-dev libjansson-dev curl rsync nghttp2-client
8+
autoconf libtool libtool-bin libpcre2-dev libjansson-dev curl rsync nghttp2-client
99

10-
RUN pip install pytest tqdm pycurl cryptography requests pyopenssl
10+
RUN pip install --break-system-packages pytest tqdm pycurl cryptography requests pyopenssl filelock
1111

12-
RUN apt install -y apache2 apache2-dev libapache2-mod-md
12+
RUN apt install -y apache2 apache2-dev
1313
RUN apt install -y pebble
1414

1515
COPY docker/debian-sid/bin/* /apache-httpd/bin/

src/md_cmd_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ static void log_print(const char *file, int line, md_log_level_t level,
257257
{
258258
if (log_is_level(baton, p, level)) {
259259
char buffer[LOG_BUF_LEN];
260-
char errbuff[32];
260+
char errbuff[64];
261261

262262
apr_vsnprintf(buffer, LOG_BUF_LEN-1, fmt, ap);
263263
buffer[LOG_BUF_LEN-1] = '\0';

0 commit comments

Comments
 (0)