From 41b3f0dc9ac57219d766964a7ebe43803a3f4011 Mon Sep 17 00:00:00 2001 From: naicoi Date: Thu, 18 May 2023 15:30:28 +0700 Subject: [PATCH] Remove Alpine and Slim from OS matrix in .woodpecker.yml The commit removes Alpine and Slim from the OS matrix in .woodpecker.yml, leaving only versions 16 and 18. Remove Alpine and Slim from OS matrix in .woodpecker.yml The commit removes Alpine and Slim from the OS matrix in .woodpecker.yml, leaving only versions 16 and 18. The pipeline has been updated to use only alpine images with the version number as a tag. The Dockerfile now uses the version number to pull an alpine image instead of specifying both the version and OS. --- .woodpecker.yml | 9 +++------ Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index db0b338..8e90e23 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,22 +1,19 @@ matrix: - os: - - alpine - - slim version: - 16 - 18 - 20 pipeline: - ${version}-${os}: + ${version}-alpine: image: woodpeckerci/plugin-docker-buildx settings: repo: lttech/pm2 platforms: linux/amd64,linux/arm64 tags: - - ${version}-${os} + - ${version} build_args: - - tag=${version}-${os} + - version=${version} username: lttech password: from_secret: docker_lttech diff --git a/Dockerfile b/Dockerfile index 62dd265..cc4b637 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG tag=16-alpine -FROM node:${tag} +ARG version=16 +FROM node:${version}-alpine RUN npm i -g pm2 RUN pm2 install typescript \ No newline at end of file