diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index 2095daf..0e1c099 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -16,7 +16,10 @@ jobs: tags: 10,dubnium platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 - path: 12 - tags: 12,erbium,latest + tags: 12,erbium + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 + - path: 14 + tags: 14,fermium,latest platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 steps: - name: Checkout diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 49f5604..7fbc07a 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -11,3 +11,4 @@ jobs: run: | docker run -i $(docker build -q 10) /bin/sh -c "node --version && git --version" docker run -i $(docker build -q 12) /bin/sh -c "node --version && git --version" + docker run -i $(docker build -q 14) /bin/sh -c "node --version && git --version" diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml index 9ec4c17..2bfcd71 100644 --- a/.github/workflows/hadolint.yml +++ b/.github/workflows/hadolint.yml @@ -8,4 +8,4 @@ jobs: steps: - uses: actions/checkout@v2 - run: brew install hadolint - - run: hadolint {10,12}/Dockerfile + - run: hadolint {10,12,14}/Dockerfile diff --git a/14/Dockerfile b/14/Dockerfile new file mode 100644 index 0000000..f8c10fa --- /dev/null +++ b/14/Dockerfile @@ -0,0 +1,9 @@ +FROM node:fermium-alpine3.12 +LABEL maintainer "Tim Brust " + +ARG REFRESHED_AT +ENV REFRESHED_AT $REFRESHED_AT + +RUN apk add --no-cache \ + git \ + openssh diff --git a/README.md b/README.md index 8d7d6b6..543bd75 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,11 @@ [![buildx Status](https://github.com/timbru31/docker-node-alpine-git/workflows/buildx/badge.svg)](https://github.com/timbru31/docker-node-alpine-git/actions?query=workflow%3Abuildx) [![Lint Dockerfiles](https://github.com/timbru31/docker-node-alpine-git/workflows/Lint%20Dockerfiles/badge.svg)](https://github.com/timbru31/docker-node-alpine-git/actions?query=workflow%3A%22Lint+Dockerfiles%22) - -A minimal Dockerfile based on Node.js 10 LTS (Dubnium) or Node.js 12 LTS (Erbium) alpine with Git and ssh installed. +A minimal Dockerfile based on Node.js 10 LTS (Dubnium), Node.js 12 LTS (Erbium) or Node.js 14 LTS (Fermium) alpine with Git and ssh installed. ## What's included -- Node.js 10 LTS or Node.js 12 LTS +- Node.js 10 LTS, Node.js 12 LTS or Node.js 14 LTS - npm 6 - yarn - Git @@ -18,6 +17,7 @@ A minimal Dockerfile based on Node.js 10 LTS (Dubnium) or Node.js 12 LTS (Erbium ### Available platforms These Dockerfiles leverage the new `buildx` functionality and offer the following platforms: + - linux/amd64 - linux/arm64 - linux/arm/v7