Skip to content

Commit 72e89c2

Browse files
committed
fix: more docker updates
1 parent 1383396 commit 72e89c2

6 files changed

Lines changed: 16 additions & 13 deletions

File tree

integrations/csharp.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM node:20-alpine3.18 AS node
2-
FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine3.18
1+
FROM node:22-alpine AS node
2+
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.22
33

44
COPY integrations/https-cert/rootCA.pem /root/integration-test.pem
55

integrations/go.Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM golang:1.20.5-alpine3.18
1+
FROM node:22-alpine AS node
2+
FROM golang:1.24-alpine3.22
23

34
COPY integrations/https-cert/rootCA.pem /root/integration-test.pem
45

@@ -8,10 +9,10 @@ RUN apk --no-cache add ca-certificates && \
89
cp /root/integration-test.pem /usr/local/share/ca-certificates/ && \
910
update-ca-certificates
1011

11-
# XXX: do we eventually need to care about getting an exact version of node
12-
# here? If so, see the csharp container for how to do that
13-
RUN apk update && \
14-
apk add nodejs npm
12+
COPY --from=node /usr/local/bin/node /usr/local/bin/
13+
COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules
14+
RUN ln -s ../lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm \
15+
&& ln -s ../lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx
1516

1617
WORKDIR /src
1718

integrations/node.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:18-alpine
1+
FROM node:22-alpine
22

33
COPY integrations/https-cert/rootCA.pem /root/integration-test.pem
44

integrations/php.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ RUN apk --no-cache add ca-certificates && \
1616
update-ca-certificates
1717

1818
RUN apk update && \
19-
apk add nodejs npm php81 php81-fpm php81-opcache php81-curl
19+
apk add nodejs npm php83 php83-fpm php83-opcache php83-curl && \
20+
ln -sf /usr/bin/php83 /usr/bin/php
2021

2122
WORKDIR /src
2223

integrations/python.Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ RUN apk --no-cache add ca-certificates && \
99
update-ca-certificates
1010

1111
RUN apk update && \
12-
apk add nodejs npm python3 py3-pip && \
13-
pip install requests
12+
apk add nodejs npm python3 py3-requests
1413

1514
WORKDIR /src
1615

src/fixtures/requests/cookies.cjs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ module.exports = {
3535
size: -1,
3636
mimeType: 'application/json',
3737
text: JSON.stringify({
38-
bar: 'baz',
39-
foo: 'bar',
38+
cookies: {
39+
bar: 'baz',
40+
foo: 'bar',
41+
},
4042
}),
4143
},
4244
headersSize: -1,

0 commit comments

Comments
 (0)