Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup, updates & add NodeJS 20 #102

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Cleanup, updates & add NodeJS 20 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1a6af16
remove unsupported Debian versions
gevalo1 Dec 13, 2023
06aa6cb
remove unsupported NodeJS versions
gevalo1 Dec 13, 2023
b361ef2
add Debian Bullseye & Bookworm to NodeJS 18 & latest
gevalo1 Dec 13, 2023
6e7ec31
add NodeJS 20
gevalo1 Dec 13, 2023
38816f0
update .travis.yml
gevalo1 Dec 13, 2023
38dd6f9
set the "slim" Dockerfile to a hardcoded Debian version
gevalo1 Dec 13, 2023
f829dfb
update README.md
gevalo1 Dec 13, 2023
24a9af3
update example-app
gevalo1 Dec 13, 2023
3a335a7
update docker-tags.sh
gevalo1 Dec 13, 2023
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
7 changes: 3 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ services:
- docker
env:
- TEST_TAGS='latest-alpine'
- TEST_TAGS='latest-stretch'
- TEST_TAGS='latest-buster'
- TEST_TAGS='latest-jessie'
- TEST_TAGS='latest-slim'
- TEST_TAGS='latest-wheezy'
- TEST_TAGS='latest-buster'
- TEST_TAGS='latest-bullseye'
- TEST_TAGS='latest-bookworm'
script:
- cd example-app && npm install && npm test && cd ..
51 changes: 17 additions & 34 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,59 +15,42 @@ Further than that, using PM2 as a layer between the container and the applicatio
**Image Name** | **Operating system** | **Dockerfile**
---|---|---
keymetrics/pm2:`latest-alpine`|[Alpine](https://www.alpinelinux.org/about/)|[latest-alpine](tags/latest/alpine/Dockerfile)
keymetrics/pm2:`18-alpine`|[Alpine](https://www.alpinelinux.org/about/)|[15-alpine](tags/16/alpine/Dockerfile)
keymetrics/pm2:`16-alpine`|[Alpine](https://www.alpinelinux.org/about/)|[15-alpine](tags/16/alpine/Dockerfile)
keymetrics/pm2:`15-alpine`|[Alpine](https://www.alpinelinux.org/about/)|[15-alpine](tags/15/alpine/Dockerfile)
keymetrics/pm2:`14-alpine`|[Alpine](https://www.alpinelinux.org/about/)|[14-alpine](tags/14/alpine/Dockerfile)
keymetrics/pm2:`12-alpine`|[Alpine](https://www.alpinelinux.org/about/)|[12-alpine](tags/12/alpine/Dockerfile)
keymetrics/pm2:`10-alpine`|[Alpine](https://www.alpinelinux.org/about/)|[10-alpine](tags/10/alpine/Dockerfile)
keymetrics/pm2:`20-alpine`|[Alpine](https://www.alpinelinux.org/about/)|[20-alpine](tags/20/alpine/Dockerfile)
keymetrics/pm2:`18-alpine`|[Alpine](https://www.alpinelinux.org/about/)|[18-alpine](tags/18/alpine/Dockerfile)

**Image Name** | **Operating system** | **Dockerfile**
---|---|---
keymetrics/pm2:`latest-buster`|[Debian Buster](https://wiki.debian.org/DebianBuster)|[latest-buster](tags/latest/buster/Dockerfile)
keymetrics/pm2:`18-buster`|[Debian Buster](https://wiki.debian.org/DebianBuster)|[18-buster](tags/18/buster/Dockerfile)
keymetrics/pm2:`16-buster`|[Debian Buster](https://wiki.debian.org/DebianBuster)|[16-buster](tags/16/buster/Dockerfile)
keymetrics/pm2:`15-buster`|[Debian Buster](https://wiki.debian.org/DebianBuster)|[15-buster](tags/15/buster/Dockerfile)
keymetrics/pm2:`14-buster`|[Debian Buster](https://wiki.debian.org/DebianBuster)|[14-buster](tags/14/buster/Dockerfile)
keymetrics/pm2:`12-buster`|[Debian Buster](https://wiki.debian.org/DebianBuster)|[12-buster](tags/12/buster/Dockerfile)
keymetrics/pm2:`10-buster`|[Debian Buster](https://wiki.debian.org/DebianBuster)|[10-buster](tags/10/buster/Dockerfile)
keymetrics/pm2:`latest-bookworm`|[Debian Bookworm](https://wiki.debian.org/DebianBookworm)|[latest-bookworm](tags/latest/bookworm/Dockerfile)
keymetrics/pm2:`20-bookworm`|[Debian Bookworm](https://wiki.debian.org/DebianBookworm)|[20-bookworm](tags/20/bookworm/Dockerfile)
keymetrics/pm2:`18-bookworm`|[Debian Bookworm](https://wiki.debian.org/DebianBookworm)|[18-bookworm](tags/18/bookworm/Dockerfile)

**Image Name** | **Operating system** | **Dockerfile**
---|---|---
keymetrics/pm2:`latest-stretch`|[Debian Stretch](https://wiki.debian.org/DebianStretch)|[latest-stretch](tags/latest/stretch/Dockerfile)
keymetrics/pm2:`18-stretch`|[Debian Stretch](https://wiki.debian.org/DebianStretch)|[18-stretch](tags/18/stretch/Dockerfile)
keymetrics/pm2:`16-stretch`|[Debian Stretch](https://wiki.debian.org/DebianStretch)|[16-stretch](tags/16/stretch/Dockerfile)
keymetrics/pm2:`15-stretch`|[Debian Stretch](https://wiki.debian.org/DebianStretch)|[15-stretch](tags/15/stretch/Dockerfile)
keymetrics/pm2:`14-stretch`|[Debian Stretch](https://wiki.debian.org/DebianStretch)|[14-stretch](tags/14/stretch/Dockerfile)
keymetrics/pm2:`12-stretch`|[Debian Stretch](https://wiki.debian.org/DebianStretch)|[12-stretch](tags/12/stretch/Dockerfile)
keymetrics/pm2:`10-stretch`|[Debian Stretch](https://wiki.debian.org/DebianStretch)|[10-stretch](tags/10/stretch/Dockerfile)
keymetrics/pm2:`latest-bullseye`|[Debian Bullseye](https://wiki.debian.org/DebianBullseye)|[latest-bullseye](tags/latest/bullseye/Dockerfile)
keymetrics/pm2:`20-bullseye`|[Debian Bullseye](https://wiki.debian.org/DebianBullseye)|[20-bullseye](tags/20/bullseye/Dockerfile)
keymetrics/pm2:`18-bullseye`|[Debian Bullseye](https://wiki.debian.org/DebianBullseye)|[18-bullseye](tags/18/bullseye/Dockerfile)

**Image Name** | **Operating system** | **Dockerfile**
---|---|---
keymetrics/pm2:`latest-jessie`|[Debian Jessie](https://wiki.debian.org/DebianJessie)|[latest-jessie](tags/latest/jessie/Dockerfile)
keymetrics/pm2:`18-jessie`|[Debian Jessie](https://wiki.debian.org/DebianJessie)|[18-jessie](tags/18/jessie/Dockerfile)
keymetrics/pm2:`16-jessie`|[Debian Jessie](https://wiki.debian.org/DebianJessie)|[16-jessie](tags/16/jessie/Dockerfile)
keymetrics/pm2:`15-jessie`|[Debian Jessie](https://wiki.debian.org/DebianJessie)|[15-jessie](tags/15/jessie/Dockerfile)
keymetrics/pm2:`14-jessie`|[Debian Jessie](https://wiki.debian.org/DebianJessie)|[14-jessie](tags/14/jessie/Dockerfile)
keymetrics/pm2:`12-jessie`|[Debian Jessie](https://wiki.debian.org/DebianJessie)|[12-jessie](tags/12/jessie/Dockerfile)
keymetrics/pm2:`10-jessie`|[Debian Jessie](https://wiki.debian.org/DebianJessie)|[10-jessie](tags/10/jessie/Dockerfile)
keymetrics/pm2:`latest-buster`|[Debian Buster](https://wiki.debian.org/DebianBuster)|[latest-buster](tags/latest/buster/Dockerfile)
keymetrics/pm2:`20-buster`|[Debian Buster](https://wiki.debian.org/DebianBuster)|[20-buster](tags/20/buster/Dockerfile)
keymetrics/pm2:`18-buster`|[Debian Buster](https://wiki.debian.org/DebianBuster)|[18-buster](tags/18/buster/Dockerfile)

**Image Name** | **Operating system** | **Dockerfile**
---|---|---
keymetrics/pm2:`latest-slim`|[Debian Stretch](https://wiki.debian.org/DebianStretch) (minimal packages)|[latest-slim](tags/latest/slim/Dockerfile)
keymetrics/pm2:`18-slim`|[Debian Stretch](https://wiki.debian.org/DebianStretch) (minimal packages)|[18-slim](tags/18/slim/Dockerfile)
keymetrics/pm2:`16-slim`|[Debian Stretch](https://wiki.debian.org/DebianStretch) (minimal packages)|[16-slim](tags/16/slim/Dockerfile)
keymetrics/pm2:`15-slim`|[Debian Stretch](https://wiki.debian.org/DebianStretch) (minimal packages)|[15-slim](tags/15/slim/Dockerfile)
keymetrics/pm2:`14-slim`|[Debian Stretch](https://wiki.debian.org/DebianStretch) (minimal packages)|[14-slim](tags/14/slim/Dockerfile)
keymetrics/pm2:`12-slim`|[Debian Stretch](https://wiki.debian.org/DebianStretch) (minimal packages)|[12-slim](tags/12/slim/Dockerfile)
keymetrics/pm2:`10-slim`|[Debian Stretch](https://wiki.debian.org/DebianStretch) (minimal packages)|[10-slim](tags/10/slim/Dockerfile)
keymetrics/pm2:`latest-slim`|[Debian Bookworm](https://wiki.debian.org/DebianBookworm) (minimal packages)|[latest-slim](tags/latest/slim/Dockerfile)
keymetrics/pm2:`20-slim`|[Debian Bookworm](https://wiki.debian.org/DebianBookworm) (minimal packages)|[20-slim](tags/20/slim/Dockerfile)
keymetrics/pm2:`18-slim`|[Debian Bookworm](https://wiki.debian.org/DebianBookworm) (minimal packages)|[18-slim](tags/18/slim/Dockerfile)


You can find more information about the image variants [here](https://github.com/nodejs/docker-node#image-variants).

> The build process of these images is automatically triggered each time [NodeJS's Docker images](https://hub.docker.com/r/library/node/tags/) are built.
The build process of these images is automatically triggered each time [Docker PM2's GitHub repo](https://github.com/keymetrics/docker-pm2) master branch is pushed.
The build process of these images is automatically triggered each time [PM2's GitHub repo](https://github.com/Unitech/pm2) master branch is pushed.

> If you absolutely need to use an older NodeJS version, check the [docker-pm2](https://hub.docker.com/r/keymetrics/pm2/tags) Docker hub page for available images. _(Not recommended)_

## Usage

Let's assume the following folder structure for your project.
Expand Down
11 changes: 3 additions & 8 deletions docker-tags.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,9 @@ self="$(basename "${BASH_SOURCE[0]}")"
date=$(date +'%Y-%m-%d %H:%M:%S')

declare -A versions
versions['latest']='alpine|stretch|buster|jessie|slim'
versions['14']='alpine|stretch|buster|jessie|slim'
versions['13']='alpine|stretch|buster|jessie|slim'
versions['12']='alpine|stretch|buster|jessie|slim'
versions['10']='alpine|stretch|buster|jessie|slim|wheezy'
versions['8']='alpine|stretch|buster|jessie|slim|wheezy'
versions['6']='alpine|stretch|jessie|slim|wheezy'
versions['4']='alpine|stretch|jessie|slim|wheezy'
versions['latest']='alpine|bookworm|bullseye|buster|slim'
versions['20']='alpine|bookworm|bullseye|buster|slim'
versions['18']='alpine|bookworm|bullseye|buster|slim'

echo "# This file is generated via $url/blob/$(fileCommit "$self")/$self"
echo "# $date"
Expand Down
5 changes: 3 additions & 2 deletions example-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
"description": "Docker PM2 example app",
"main": "index.js",
"private": "true",
"type": "module",
"scripts": {
"test": "xo&& bash ./test/test.sh"
"test": "xo && bash ./test/test.sh"
},
"author": "Keymetrics <[email protected]>",
"license": "MIT",
"devDependencies": {
"xo": "^0.18.2"
"xo": "^0.56.0"
},
"xo": {
"space": true
Expand Down
11 changes: 5 additions & 6 deletions example-app/src/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
'use strict';
import http from 'node:http';
import process from 'node:process';

const http = require('http');

http.createServer((req, res) => {
res.writeHead(200);
res.end('hey');
http.createServer((_request, response) => {
response.writeHead(200);
response.end('hey');
}).listen(process.env.PORT || 3000, () => {
console.log('App listening on port 3000');
});
2 changes: 0 additions & 2 deletions example-app/src/worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

setInterval(() => {
console.log('Worker doing his job');
}, 2000);
4 changes: 2 additions & 2 deletions example-app/test/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ function success {
}

function spec {
if [ $1 == $2 ]; then
if [ "$1" == "$2" ]; then
success "$3"
else
fail "$3"
fi
}

function ispec {
if [ $1 != $2 ]; then
if [ "$1" != "$2" ]; then
success "$3"
else
fail "$3"
Expand Down
11 changes: 0 additions & 11 deletions tags/10/stretch/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/12/alpine/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/12/buster/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/12/stretch/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/14/alpine/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/14/buster/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/14/jessie/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/14/slim/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/14/stretch/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/15/alpine/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/15/buster/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/15/jessie/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/15/slim/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/15/stretch/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/16/alpine/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/16/buster/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/16/jessie/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/16/slim/Dockerfile
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tags/16/stretch/Dockerfile
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tags/10/jessie/Dockerfile → tags/18/bookworm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10
FROM node:18-bookworm
LABEL maintainer="Keymetrics <[email protected]>"

# Install pm2
Expand Down
Loading