Merge branch 'master' into docker-creds

.woodpecker/docs.yml

@@ -1,15 +1,19 @@
+variables:
+  - &node_image 'node:16-alpine'
+  - &when_path
+    - "docs/**"
+    - ".woodpecker/docs.yml"
+
 pipeline:
   build:
-    image: node:14-alpine
+    image: *node_image
     commands:
       - cd docs/
       - yarn install --frozen-lockfile
       - yarn build
     when:
       event: [push, pull_request]
-      path:
-        - "docs/**"
-        - ".woodpecker/docs.yml"
+      path: *when_path
 
   deploy-preview:
     image: woodpeckerci/plugin-surge-preview:next
@@ -23,9 +27,8 @@ pipeline:
         from_secret: GITHUB_TOKEN_SURGE
     when:
       event: pull_request
-      path:
-        - "docs/**"
-        - ".woodpecker/docs.yml"
+      path: *when_path
+
   # TODO: add step to remove preview again after PR is closed (waiting for #286)
 
   deploy:
@@ -52,7 +55,4 @@ pipeline:
     when:
       event: push
       branch: ${CI_REPO_DEFAULT_BRANCH}
-      path:
-        - "docs/**"
-        - ".woodpecker/docs.yml"
-
+      path: *when_path

README.md

@@ -81,7 +81,7 @@ https://woodpecker-ci.org/
 
 See [Contributing Guide](CONTRIBUTING.md)
 
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://woodpecker-ci.org/docs/development/getting-started#preparation-for-local-development)
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://woodpecker-ci.org/docs/development/getting-started#gitpod)
 
 ## 👋 Who uses Woodpecker?
 

cli/build/build_logs.go

@@ -2,8 +2,10 @@ package build
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/woodpecker-ci/woodpecker/cli/common"
+	"github.com/woodpecker-ci/woodpecker/cli/internal"
 
 	"github.com/urfave/cli/v2"
 )
@@ -17,6 +19,35 @@ var buildLogsCmd = &cli.Command{
 }
 
 func buildLogs(c *cli.Context) error {
-	// TODO: add logs command
-	return fmt.Errorf("Command temporarily disabled. See https://github.com/woodpecker-ci/woodpecker/issues/383")
+	repo := c.Args().First()
+	owner, name, err := internal.ParseRepo(repo)
+	if err != nil {
+		return err
+	}
+
+	number, err := strconv.Atoi(c.Args().Get(1))
+	if err != nil {
+		return err
+	}
+
+	job, err := strconv.Atoi(c.Args().Get(2))
+	if err != nil {
+		return err
+	}
+
+	client, err := internal.NewClient(c)
+	if err != nil {
+		return err
+	}
+
+	logs, err := client.BuildLogs(owner, name, number, job)
+	if err != nil {
+		return err
+	}
+
+	for _, log := range logs {
+		fmt.Print(log.Output)
+	}
+
+	return nil
 }

cmd/agent/agent.go

@@ -51,7 +51,7 @@ func loop(c *cli.Context) error {
 		"repo":     "*", // allow all repos by default
 	}
 
-	for _, v := range c.StringSlice("filter-labels") {
+	for _, v := range c.StringSlice("filter") {
 		parts := strings.SplitN(v, "=", 2)
 		labels[parts[0]] = parts[1]
 	}

docs/docs/30-administration/11-forges/10-overview.md

@@ -4,11 +4,11 @@
 
 | Feature | [GitHub](github/) | [Gitea](gitea/) | [Gitlab](gitlab/) | [Bitbucket](bitbucket/) | [Bitbucket Server](bitbucket_server/) | [Gogs](gogs/) | [Coding](coding/) |
 | --- | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-| Event: Push | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| Event: Tag | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| Event: Pull-Request | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| Event: Deploy | :white_check_mark: | :x: | :x: |
-| OAuth | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Event: Push | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Event: Tag | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | :x: |
+| Event: Pull-Request | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: |
+| Event: Deploy | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
+| OAuth | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: |
 | [Multi pipeline](/docs/usage/multi-pipeline) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: |
 | [when.path filter](/docs/usage/pipeline-syntax#path) | :white_check_mark: | :white_check_mark:¹ | :white_check_mark: | :x: | :x: | :x: | :x: |
 

docs/docs/30-administration/70-proxy.md

@@ -1,6 +1,7 @@
 # Proxy
 
 ## Apache
+
 This guide provides a brief overview for installing Woodpecker server behind the Apache2 webserver. This is an example configuration:
 
 ```nohighlight
@@ -85,12 +86,21 @@ This guide provides a brief overview for installing Woodpecker server behind the
 woodpecker.example.com {
   reverse_proxy woodpecker-server:8000
 }
+
+woodpeckeragent.example.com {
+  reverse_proxy h2c://woodpecker-server:9000
+}
 ```
 
+:::note
+Above configuration shows how to create reverse-proxies for web and agent communication. If your agent uses SSL do not forget to enable [WOODPECKER_GRPC_SECURE](/docs/administration/agent-config#woodpecker_grpc_secure).
+:::
+
 ## Ngrok
+
 After installing [ngrok](https://ngrok.com/), open a new console and run:
 
-```
+```bash
 ngrok http 8000
 ```
 

docs/docusaurus.config.js

@@ -126,12 +126,6 @@ module.exports = {
       backgroundColor: 'var(--ifm-color-primary)',
       textColor: 'var(--ifm-color-gray-900)',
     },
-    algolia: {
-      appId: 'BH4D9OD16A',
-      apiKey: '148f85e216b68d20ffa49d46a2b89d0e',
-      indexName: 'woodpecker-ci',
-      debug: false, // Set debug to true if you want to inspect the modal
-    },
     tableOfContents: {
       minHeadingLevel: 2,
       maxHeadingLevel: 4,
@@ -164,7 +158,15 @@ module.exports = {
       },
     }),
   ],
-  themes: [path.resolve(__dirname, 'plugins', 'woodpecker-plugins', 'dist')],
+  themes: [
+    path.resolve(__dirname, 'plugins', 'woodpecker-plugins', 'dist'),
+    [
+      require.resolve("@easyops-cn/docusaurus-search-local"),
+      {
+        hashed: true,
+      },
+    ],
+  ],
   presets: [
     [
       '@docusaurus/preset-classic',

docs/package.json

@@ -15,14 +15,14 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "^2.0.0-beta.18",
-    "@docusaurus/preset-classic": "^2.0.0-beta.18",
-    "@docusaurus/theme-search-algolia": "^2.0.0-beta.18",
+    "@docusaurus/core": "^2.0.1",
+    "@docusaurus/preset-classic": "^2.0.1",
+    "@easyops-cn/docusaurus-search-local": "^0.31.0",
     "@mdx-js/react": "^1.6.22",
-    "@svgr/webpack": "^6.2.1",
-    "clsx": "^1.1.1",
+    "@svgr/webpack": "^6.3.1",
+    "clsx": "^1.2.1",
     "file-loader": "^6.2.0",
-    "prism-react-renderer": "^1.3.1",
+    "prism-react-renderer": "^1.3.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "url-loader": "^4.1.1"
@@ -40,11 +40,11 @@
     ]
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "^2.0.0-beta.18",
-    "@tsconfig/docusaurus": "^1.0.5",
-    "@types/react": "^17.0.43",
+    "@docusaurus/module-type-aliases": "^2.0.1",
+    "@tsconfig/docusaurus": "^1.0.6",
+    "@types/react": "^18.0.17",
     "@types/react-helmet": "^6.1.5",
     "@types/react-router-dom": "^5.3.3",
-    "typescript": "^4.6.3"
+    "typescript": "^4.7.4"
   }
 }