diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index e1dddcb..b0fce0c 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -13,9 +13,6 @@ jobs: fail-fast: false matrix: docker-file: - - path: 10 - 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" 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 7fbc07a..3b34668 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -9,6 +9,5 @@ jobs: - uses: actions/checkout@v2 - name: Build the Docker image 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 2bfcd71..39052e9 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,14}/Dockerfile + - run: hadolint {12,14}/Dockerfile diff --git a/10/Dockerfile b/10/Dockerfile deleted file mode 100644 index e18a29d..0000000 --- a/10/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM node:dubnium-alpine -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 543bd75..37926cf 100644 --- a/README.md +++ b/README.md @@ -4,11 +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), Node.js 12 LTS (Erbium) or Node.js 14 LTS (Fermium) alpine with Git and ssh installed. +A minimal Dockerfile based on Node.js 12 LTS (Erbium) or Node.js 14 LTS (Fermium) alpine with Git and ssh installed. ## What's included -- Node.js 10 LTS, Node.js 12 LTS or Node.js 14 LTS +- Node.js Node.js 12 LTS or Node.js 14 LTS - npm 6 - yarn - Git @@ -24,7 +24,6 @@ These Dockerfiles leverage the new `buildx` functionality and offer the followin - linux/arm/v6 - linux/ppc64le - linux/s390x -- linux/386 (not for Node.js >= 12) ---