diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml index 138fa04..65e9b6a 100644 --- a/.woodpecker/docker.yaml +++ b/.woodpecker/docker.yaml @@ -1,5 +1,11 @@ variables: - &buildx_plugin 'woodpeckerci/plugin-docker-buildx:latest' + - publish_logins: &publish_logins # Default DockerHub login + - registry: https://index.docker.io/v1/ + username: + from_secret: DOCKER_USERNAME + password: + from_secret: DOCKER_PASSWORD - path: &when_path # web source code - 'assets/**' @@ -11,23 +17,13 @@ variables: # pipeline config changes - '.woodpecker/docker.yaml' -when: - - event: [ tag, release ] - branch: [ v2 ] - - event: [ push ] - branch: [ v2 ] - path: *when_path - steps: release: image: *buildx_plugin settings: dockerfile: Dockerfile repo: vnpower/pixivfe - username: - from_secret: DOCKER_USERNAME - password: - from_secret: DOCKER_PASSWORD + logins: *publish_logins tag: [latest, '${CI_COMMIT_TAG}'] when: - event: [ tag, release ] @@ -38,10 +34,7 @@ steps: settings: dockerfile: Dockerfile repo: vnpower/pixivfe - username: - from_secret: DOCKER_USERNAME - password: - from_secret: DOCKER_PASSWORD + logins: *publish_logins tag: [next, 'next-${CI_COMMIT_SHA:0:10}'] when: - event: [ push ] diff --git a/.woodpecker/docs.yaml b/.woodpecker/docs.yaml index fcbcfc8..8c6676d 100644 --- a/.woodpecker/docs.yaml +++ b/.woodpecker/docs.yaml @@ -1,4 +1,5 @@ variables: + - &alpine_image 'alpine:3.19' - &git_image 'woodpeckerci/plugin-git:latest' - &mkdocs_image 'woodpeckerci/plugin-mkdocs:latest' - path: &docs_path