merge pipeline steps

.woodpecker/next.yml

@@ -2,40 +2,63 @@ depends_on:
   - test
 
 pipeline:
-  buildNext:
+  build:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     settings:
-      #dry_run: true
+      repo: ocram85/blog, gitea.ocram85.com/ocram85/blog
-      repo: ocram85/blog
       dockerfile: Dockerfile
       tags: next
       build_args:
         - NODE_BASE=lts-buster-slim
         - NGINX_BASE=1.23.1-alpine
-      username:
+      logins:
-        from_secret: hub_user
+        - registry: https://index.docker.io/v1/
-      password:
+          username:
-        from_secret: hub_passwd
+            from_secret: hub_user
+          password:
+            from_secret: hub_passwd
+        - registry: https://gitea.ocram85.com
+          username:
+            from_secret: gitea_user
+          password:
+            from_secret: gitea_passwd
     when:
       event: pull_request
 
-  buildNextGitea:
+  #buildNext:
-    image: plugins/docker
+  #  image: plugins/docker
-    settings:
+  #  settings:
-      #dry_run: true
+  #    #dry_run: true
-      registry: gitea.ocram85.com
+  #    repo: ocram85/blog
-      repo: gitea.ocram85.com/ocram85/blog
+  #    dockerfile: Dockerfile
-      dockerfile: Dockerfile
+  #    tags: next
-      tags: next
+  #    build_args:
-      build_args:
+  #      - NODE_BASE=lts-buster-slim
-        - NODE_BASE=lts-buster-slim
+  #      - NGINX_BASE=1.23.1-alpine
-        - NGINX_BASE=1.23.1-alpine
+  #    username:
-      username:
+  #      from_secret: hub_user
-        from_secret: gitea_user
+  #    password:
-      password:
+  #      from_secret: hub_passwd
-        from_secret: gitea_passwd
+  #  when:
-    when:
+  #    event: pull_request
-      event: pull_request
+#
+  #buildNextGitea:
+  #  image: plugins/docker
+  #  settings:
+  #    #dry_run: true
+  #    registry: gitea.ocram85.com
+  #    repo: gitea.ocram85.com/ocram85/blog
+  #    dockerfile: Dockerfile
+  #    tags: next
+  #    build_args:
+  #      - NODE_BASE=lts-buster-slim
+  #      - NGINX_BASE=1.23.1-alpine
+  #    username:
+  #      from_secret: gitea_user
+  #    password:
+  #      from_secret: gitea_passwd
+  #  when:
+  #    event: pull_request
 
   trivyNext:
     image: aquasec/trivy:0.24.3