From 723a5d380069a4b9bef43b907339e63bc5862a41 Mon Sep 17 00:00:00 2001 From: Tim Brust Date: Tue, 17 May 2022 11:00:24 +0200 Subject: [PATCH] refactor!: remove EOL Node.js 12 --- .github/workflows/buildx.yml | 5 +---- .github/workflows/dockerimage.yml | 1 - .github/workflows/hadolint.yml | 2 +- .vscode/settings.json | 5 +++++ 12/Dockerfile | 10 ---------- README.md | 6 +++--- 6 files changed, 10 insertions(+), 19 deletions(-) create mode 100644 .vscode/settings.json delete mode 100644 12/Dockerfile diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index 705b7c3..01716c0 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -8,14 +8,11 @@ on: jobs: buildx: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: docker-file: - - path: 12 - tags: "12 erbium" - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 - path: 14 tags: "14 fermium" platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index f87584b..cdbad5e 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -9,6 +9,5 @@ jobs: - uses: actions/checkout@v3 - name: Build the Docker image run: | - docker run -i $(docker build -q 12) /bin/sh -c "node --version && npm --version && git --version" docker run -i $(docker build -q 14) /bin/sh -c "node --version && npm --version && git --version" docker run -i $(docker build -q 16) /bin/sh -c "node --version && npm --version && git --version" diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml index 7bfea43..2fef610 100644 --- a/.github/workflows/hadolint.yml +++ b/.github/workflows/hadolint.yml @@ -8,4 +8,4 @@ jobs: steps: - uses: actions/checkout@v3 - run: brew install hadolint - - run: hadolint {12,14,16}/Dockerfile + - run: hadolint {14,16}/Dockerfile diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..58e55f5 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "yaml.schemas": { + "https://json.schemastore.org/github-workflow.json": "./.github/workflows/hadolint.yml" + } +} diff --git a/12/Dockerfile b/12/Dockerfile deleted file mode 100644 index 1faa134..0000000 --- a/12/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM node:erbium-alpine3.14 -LABEL maintainer "Tim Brust " - -ARG REFRESHED_AT -ENV REFRESHED_AT $REFRESHED_AT - -RUN apk -U upgrade \ - && apk add --no-cache \ - git \ - openssh diff --git a/README.md b/README.md index bb02d94..ad28763 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,12 @@ [![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 12 LTS (Erbium), Node.js 14 LTS (Fermium) or Node.js 16 LTS (Gallium) alpine with Git and ssh installed. +A minimal Dockerfile based on Node.js 14 LTS (Fermium) or Node.js 16 LTS (Gallium) alpine with Git and ssh installed. ## What's included -- Node.js Node.js 12 LTS, Node.js 14 LTS or Node.js 16 LTS -- npm 6 (< Node.js 16) or npm 8 (Node.js 16) +- Node.js 14 LTS (Fermium) or 16 LTS (Gallium) +- npm 6 (Node.js 14) or npm 8 (Node.js 16) - yarn - Git - ssh