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
21 changes: 9 additions & 12 deletions 14/Dockerfile → 22/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM debian:trixie-slim

ENV NPM_CONFIG_LOGLEVEL=info
ENV NODE_VERSION=14.17.1
ENV NODE_VERSION=22.18.0

# gpg keys listed at https://github.com/nodejs/node
RUN set -ex \
Expand All @@ -11,17 +11,14 @@ RUN set -ex \
# use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150
&& export GNUPGHOME="$(mktemp -d)" \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
108F52B48DB57BB0CC439B2997B01419BD92F80A \
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
5BE8A3F6C8A5C01D106C0AD820B1A390B168D356 \
DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \
CC68F5A3106FF448322E48ED27F5E38D5B0A215F \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
108F52B48DB57BB0CC439B2997B01419BD92F80A \
A363A499291CBBC940DD62E41F10027AF002F8B0 \
; do \
{ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" && gpg --batch --fingerprint "$key"; } || \
{ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && gpg --batch --fingerprint "$key"; } ; \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ bundle exec rake

The above will run Serverspec and using the docker-api gem it will

- Build a Docker image from the Docker file found in the top level directories (4.4 and 6.3)
- Build a Docker image from the Docker file found in the top level directories (22)
- Create a container of that image,
- Run the tests found in `spec/` on the container
- Delete the images and containers if the test was successful
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
create_image(tag)
end

test_node("14.17.1")
test_node("22.18.0")

test_npm

Expand Down
4 changes: 0 additions & 4 deletions spec/npm_tests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,4 @@ def test_npm
describe command("echo \'{\"foo\":\"bar\"}\' | json foo") do
its(:stdout) { should match /bar/ }
end

describe command('npm install express') do
its(:exit_status) { should eq 0 }
end
end