From ba137af6bed8fa75a6a76bf2296ad492e7b6a9ad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 18:18:45 +0000 Subject: [PATCH 1/4] fix(deps): update module github.com/docker/docker to v24 [security] --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index fad30e054f..d1e9ebe01c 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/distribution/reference v0.5.0 github.com/docker/cli v23.0.7+incompatible - github.com/docker/docker v23.0.7+incompatible + github.com/docker/docker v24.0.7+incompatible github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.5.0 github.com/drone/envsubst v1.0.3 diff --git a/go.sum b/go.sum index 417ddfd680..18e1bcbe7e 100644 --- a/go.sum +++ b/go.sum @@ -70,6 +70,8 @@ github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBi github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v23.0.7+incompatible h1:6RD6ZfR9LYacFt90L41R/6/SyO+RZ1zWU7+bt6tdRNk= github.com/docker/docker v23.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= +github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= From e29b0517112505921c148d88ff93a754a05da8cd Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 18:19:33 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks [CI SKIP] for more information, see https://pre-commit.ci --- SECURITY.md | 2 +- docs/blog/2023-07-28-release-v1.0.0/index.md | 16 ++--- .../20-usage/15-terminiology/architecture.svg | 6 +- .../pipeline-workflow-step.svg | 6 +- .../30-administration/10-server-config.md | 6 +- docs/docs/92-development/03-ui.md | 2 +- docs/docs/92-development/09-security.md | 2 +- docs/docs/92-development/ui-proxy.svg | 4 +- .../20-usage/22-conditional-execution.md | 2 +- .../version-0.15/20-usage/40-secrets.md | 2 +- .../20-usage/71-project-settings.md | 1 - .../30-administration/15-agent-config.md | 4 +- .../30-administration/80-kubernetes.md | 1 - .../version-0.15/92-development/ui-proxy.svg | 4 +- .../20-usage/71-project-settings.md | 2 +- .../30-administration/10-server-config.md | 6 +- .../30-administration/22-backends/20-local.md | 1 - .../30-administration/40-encryption.md | 6 +- docs/versioned_docs/version-1.0/40-cli.md | 68 +++++++++---------- .../version-1.0/92-development/03-ui.md | 2 +- .../version-1.0/92-development/09-security.md | 2 +- .../version-1.0/92-development/ui-proxy.svg | 4 +- web/public/favicons/favicon-dark-error.svg | 2 +- web/public/favicons/favicon-dark-pending.svg | 2 +- web/public/favicons/favicon-dark-success.svg | 2 +- web/public/favicons/favicon-light-default.svg | 2 +- web/public/favicons/favicon-light-error.svg | 2 +- web/public/favicons/favicon-light-pending.svg | 2 +- web/public/favicons/favicon-light-success.svg | 2 +- woodpecker-go/LICENSE | 1 - 30 files changed, 80 insertions(+), 84 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index e8b2d95f25..86f925c077 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,6 +1,6 @@ # Security -We take security seriously. +We take security seriously. If you discover a security issue, please bring it to their attention right away! ### Reporting a Vulnerability diff --git a/docs/blog/2023-07-28-release-v1.0.0/index.md b/docs/blog/2023-07-28-release-v1.0.0/index.md index b5db8ec39f..98e1739bb6 100644 --- a/docs/blog/2023-07-28-release-v1.0.0/index.md +++ b/docs/blog/2023-07-28-release-v1.0.0/index.md @@ -16,8 +16,8 @@ It took us quite some time, but now we are sure it's ready, and you should reall -We've refactored a lot of code, so contributing to the codebase should be much easier. -Furthermore, a ton of bugs where addressed and various enhancements introduced, along with some highly anticipated features. +We've refactored a lot of code, so contributing to the codebase should be much easier. +Furthermore, a ton of bugs where addressed and various enhancements introduced, along with some highly anticipated features. With Woodpecker v1.0.0, you can now substantially improve and streamline your code pipelines, empowering you to automate and optimize workflows like never before. @@ -31,33 +31,33 @@ Schedule pipelines to run at specified intervals or times, optimizing repetitive ### YAML Map Merge, Overrides, and Sequence Merge Support -With enhanced YAML support, managing complex configurations becomes a breeze. +With enhanced YAML support, managing complex configurations becomes a breeze. Merge maps, apply overrides, and sequence merging—all within your YAML files. This is providing more flexibility and control over your pipelines. [Read more](/docs/usage/advanced-yaml-syntax) ### Web-UI for Admins -Simplify administration tasks with Woodpecker's new Admin UI. +Simplify administration tasks with Woodpecker's new Admin UI. Effortlessly manage user accounts, agents, and tasks, including adding new agents or pausing the task queue for maintenance. ![Image of admin queue view](./admin_queue_ui.png) ### Localize Web-UI -Embrace internationalization by changing your locale in the user settings. -Interact with Woodpecker in the language of your choice, tailored to your preferences. +Embrace internationalization by changing your locale in the user settings. +Interact with Woodpecker in the language of your choice, tailored to your preferences. If your language is not available or only partially translated, consider contributing to our [Weblate](https://translate.woodpecker-ci.org/engage/woodpecker-ci/). ### Add `evaluate` to `when` Filter Enhance pipeline flexibility with the new "when evaluate" filter, enabling or disabling steps based on custom conditions. -Customize your workflows to dynamically respond to specific triggers and events. +Customize your workflows to dynamically respond to specific triggers and events. [Read more](/docs/usage/pipeline-syntax#evaluate) ### Global- and Organization-Secrets -Save time and effort by declaring secrets for your entire instance or organization. +Save time and effort by declaring secrets for your entire instance or organization. Simplify your workflow and securely manage sensitive information across projects. ![Image of settings view of org secrets](./org_secrets.png) diff --git a/docs/docs/20-usage/15-terminiology/architecture.svg b/docs/docs/20-usage/15-terminiology/architecture.svg index 45967fc92e..b34e96fdd8 100644 --- a/docs/docs/20-usage/15-terminiology/architecture.svg +++ b/docs/docs/20-usage/15-terminiology/architecture.svg @@ -1,6 +1,6 @@ - + - + - ServerUIGRPCAgent 1User => BrowserAutoscalerStarts agents based on amount of pending pipelinesExecutes pending workflows of a pipelineCentral unit of a Woodpecker instance ForgeGithub, Gitea, Github, Bitbucket, ...WebhooksOAuthsends events like push, tag, ...allows users to login using existing accountreceives workflows & returns logs + statusesreceives workflows & returns logs + statusesBackendThe backend is the environment (exp. Docker / Kubernetes / local) used to execute workflows in.startsAgent ... \ No newline at end of file + ServerUIGRPCAgent 1User => BrowserAutoscalerStarts agents based on amount of pending pipelinesExecutes pending workflows of a pipelineCentral unit of a Woodpecker instance ForgeGithub, Gitea, Github, Bitbucket, ...WebhooksOAuthsends events like push, tag, ...allows users to login using existing accountreceives workflows & returns logs + statusesreceives workflows & returns logs + statusesBackendThe backend is the environment (exp. Docker / Kubernetes / local) used to execute workflows in.startsAgent ... diff --git a/docs/docs/20-usage/15-terminiology/pipeline-workflow-step.svg b/docs/docs/20-usage/15-terminiology/pipeline-workflow-step.svg index 555347d603..4ea3aab0ac 100644 --- a/docs/docs/20-usage/15-terminiology/pipeline-workflow-step.svg +++ b/docs/docs/20-usage/15-terminiology/pipeline-workflow-step.svg @@ -1,6 +1,6 @@ - + - + - PipelineClone step1. Step2. StepA pipeline is triggered by an eventlike a push, tag, manualEvery pipeline consists of multiple workflows.Each defined by a separate YAML file and is named after the filename.Each workflow has its own workspace (folder) which isused by all steps of that workflow.The default first step of each workflow is the clone step.Its fetches the specific code version for a pipeline.Workflow "build"Clone step1. Step2. StepWorkflow "test"Additional steps are used to execute commands or pluginslike `make install` or release-to-github \ No newline at end of file + PipelineClone step1. Step2. StepA pipeline is triggered by an eventlike a push, tag, manualEvery pipeline consists of multiple workflows.Each defined by a separate YAML file and is named after the filename.Each workflow has its own workspace (folder) which isused by all steps of that workflow.The default first step of each workflow is the clone step.Its fetches the specific code version for a pipeline.Workflow "build"Clone step1. Step2. StepWorkflow "test"Additional steps are used to execute commands or pluginslike `make install` or release-to-github diff --git a/docs/docs/30-administration/10-server-config.md b/docs/docs/30-administration/10-server-config.md index e3740338e1..ad6e9ca516 100644 --- a/docs/docs/30-administration/10-server-config.md +++ b/docs/docs/30-administration/10-server-config.md @@ -20,9 +20,9 @@ services: + - WOODPECKER_OPEN=true ``` -You can **also restrict** registration, by keep registration closed and ... -... **adding** new **users manually** via the CLI: `woodpecker-cli user add`, or -... allowing specific **admin users** via the `WOODPECKER_ADMIN` setting, or +You can **also restrict** registration, by keep registration closed and ... +... **adding** new **users manually** via the CLI: `woodpecker-cli user add`, or +... allowing specific **admin users** via the `WOODPECKER_ADMIN` setting, or by open registration and **filter by organization** membership through the `WOODPECKER_ORGS` setting. ### To close registration, but allow specific admin users diff --git a/docs/docs/92-development/03-ui.md b/docs/docs/92-development/03-ui.md index 7bc13b1ee5..1fcf45ab46 100644 --- a/docs/docs/92-development/03-ui.md +++ b/docs/docs/92-development/03-ui.md @@ -33,7 +33,7 @@ The following list contains some tools and frameworks used by the Woodpecker UI. ## Messages and Translations -Woodpecker uses [Vue I18n](https://vue-i18n.intlify.dev/) as translation library. New translations have to be added to `web/src/assets/locales/en.json`. The English source file will be automatically imported into [Weblate](https://translate.woodpecker-ci.org/) (the translation system used by Woodpecker) where all other languages will be translated by the community based on the English source. +Woodpecker uses [Vue I18n](https://vue-i18n.intlify.dev/) as translation library. New translations have to be added to `web/src/assets/locales/en.json`. The English source file will be automatically imported into [Weblate](https://translate.woodpecker-ci.org/) (the translation system used by Woodpecker) where all other languages will be translated by the community based on the English source. You must not provide translations except English in PRs, otherwise weblate could put git into conflicts (when someone has translated in that language file and changes are not into main branch yet) For more information about translations see [Translations](./07-translations.md). diff --git a/docs/docs/92-development/09-security.md b/docs/docs/92-development/09-security.md index e8b2d95f25..86f925c077 100644 --- a/docs/docs/92-development/09-security.md +++ b/docs/docs/92-development/09-security.md @@ -1,6 +1,6 @@ # Security -We take security seriously. +We take security seriously. If you discover a security issue, please bring it to their attention right away! ### Reporting a Vulnerability diff --git a/docs/docs/92-development/ui-proxy.svg b/docs/docs/92-development/ui-proxy.svg index 6ccb744587..79809ffa19 100644 --- a/docs/docs/92-development/ui-proxy.svg +++ b/docs/docs/92-development/ui-proxy.svg @@ -1,6 +1,6 @@ - + - forward requestin dev modeUI Server Port 8010Woodpecker ServerBrowserPort 8000/login/logout/api/.../api/web-config.js/streamEvery other request(404 Handler) \ No newline at end of file + forward requestin dev modeUI Server Port 8010Woodpecker ServerBrowserPort 8000/login/logout/api/.../api/web-config.js/streamEvery other request(404 Handler) diff --git a/docs/versioned_docs/version-0.15/20-usage/22-conditional-execution.md b/docs/versioned_docs/version-0.15/20-usage/22-conditional-execution.md index 81e5f00932..432b056343 100644 --- a/docs/versioned_docs/version-0.15/20-usage/22-conditional-execution.md +++ b/docs/versioned_docs/version-0.15/20-usage/22-conditional-execution.md @@ -150,7 +150,7 @@ when: :::info This feature is currently only available for GitHub, GitLab and Gitea. -Pull requests aren't supported by gitea at the moment ([go-gitea/gitea#18228](https://github.com/go-gitea/gitea/pull/18228)). +Pull requests aren't supported by gitea at the moment ([go-gitea/gitea#18228](https://github.com/go-gitea/gitea/pull/18228)). Path conditions are ignored for tag events. ::: diff --git a/docs/versioned_docs/version-0.15/20-usage/40-secrets.md b/docs/versioned_docs/version-0.15/20-usage/40-secrets.md index 195f3999a4..c2584524a9 100644 --- a/docs/versioned_docs/version-0.15/20-usage/40-secrets.md +++ b/docs/versioned_docs/version-0.15/20-usage/40-secrets.md @@ -14,7 +14,7 @@ pipeline: + secrets: [ docker_username, docker_password ] ``` -Alternatively, you can get a `setting` from secrets using the `from_secret` syntax. +Alternatively, you can get a `setting` from secrets using the `from_secret` syntax. In this example, the secret named `secret_token` would be passed to the pipeline as `PLUGIN_TOKEN`. **NOTE:** the `from_secret` syntax only works with the newer `settings` block. diff --git a/docs/versioned_docs/version-0.15/20-usage/71-project-settings.md b/docs/versioned_docs/version-0.15/20-usage/71-project-settings.md index 5173ff78a0..b2c6ec6bb6 100644 --- a/docs/versioned_docs/version-0.15/20-usage/71-project-settings.md +++ b/docs/versioned_docs/version-0.15/20-usage/71-project-settings.md @@ -33,4 +33,3 @@ You can change the visibility of your project by this setting. If a user has acc ## Timeout After this timeout a pipeline has to finish or will be treated as timed out. - diff --git a/docs/versioned_docs/version-0.15/30-administration/15-agent-config.md b/docs/versioned_docs/version-0.15/30-administration/15-agent-config.md index cf3afae54e..bf490bf087 100644 --- a/docs/versioned_docs/version-0.15/30-administration/15-agent-config.md +++ b/docs/versioned_docs/version-0.15/30-administration/15-agent-config.md @@ -79,8 +79,8 @@ See [Conditionals Pipeline](../20-usage/20-pipeline-syntax.md#step-when---condit ## All agent configuration options Here is the full list of configuration options and their default variables. -#### `DOCKER_HOST` -> Default: empty +#### `DOCKER_HOST` +> Default: empty Point to an alternate socket file or host. For example, "unix:////run/podman/podman.sock" diff --git a/docs/versioned_docs/version-0.15/30-administration/80-kubernetes.md b/docs/versioned_docs/version-0.15/30-administration/80-kubernetes.md index 6132a51897..10d1d66d84 100644 --- a/docs/versioned_docs/version-0.15/30-administration/80-kubernetes.md +++ b/docs/versioned_docs/version-0.15/30-administration/80-kubernetes.md @@ -210,4 +210,3 @@ spec: - name: sock-dir emptyDir: {} ``` - diff --git a/docs/versioned_docs/version-0.15/92-development/ui-proxy.svg b/docs/versioned_docs/version-0.15/92-development/ui-proxy.svg index 6ccb744587..79809ffa19 100644 --- a/docs/versioned_docs/version-0.15/92-development/ui-proxy.svg +++ b/docs/versioned_docs/version-0.15/92-development/ui-proxy.svg @@ -1,6 +1,6 @@ - + - forward requestin dev modeUI Server Port 8010Woodpecker ServerBrowserPort 8000/login/logout/api/.../api/web-config.js/streamEvery other request(404 Handler) \ No newline at end of file + forward requestin dev modeUI Server Port 8010Woodpecker ServerBrowserPort 8000/login/logout/api/.../api/web-config.js/streamEvery other request(404 Handler) diff --git a/docs/versioned_docs/version-1.0/20-usage/71-project-settings.md b/docs/versioned_docs/version-1.0/20-usage/71-project-settings.md index d65552182e..319a07e610 100644 --- a/docs/versioned_docs/version-1.0/20-usage/71-project-settings.md +++ b/docs/versioned_docs/version-1.0/20-usage/71-project-settings.md @@ -21,7 +21,7 @@ Enables handling webhook's pull request event. If disabled, then pipeline won't ### Protected Every pipeline initiated by an webhook event needs to be approved by a project members with push permissions before being executed. -The protected option can be used as an additional review process before running potentially harmful pipelines. Especially if pipelines can be executed by third-parties through pull-requests. +The protected option can be used as an additional review process before running potentially harmful pipelines. Especially if pipelines can be executed by third-parties through pull-requests. ### Trusted diff --git a/docs/versioned_docs/version-1.0/30-administration/10-server-config.md b/docs/versioned_docs/version-1.0/30-administration/10-server-config.md index 9f86cb1c0e..9e05c79a9a 100644 --- a/docs/versioned_docs/version-1.0/30-administration/10-server-config.md +++ b/docs/versioned_docs/version-1.0/30-administration/10-server-config.md @@ -20,9 +20,9 @@ services: + - WOODPECKER_OPEN=true ``` -You can **also restrict** registration, by keep registration closed and ... -... **adding** new **users manually** via the CLI: `woodpecker-cli user add`, or -... allowing specific **admin users** via the `WOODPECKER_ADMIN` setting, or +You can **also restrict** registration, by keep registration closed and ... +... **adding** new **users manually** via the CLI: `woodpecker-cli user add`, or +... allowing specific **admin users** via the `WOODPECKER_ADMIN` setting, or by open registration and **filter by organization** membership through the `WOODPECKER_ORGS` setting. ### To close registration, but allow specific admin users diff --git a/docs/versioned_docs/version-1.0/30-administration/22-backends/20-local.md b/docs/versioned_docs/version-1.0/30-administration/22-backends/20-local.md index c8c5dbc4eb..39ff4c219d 100644 --- a/docs/versioned_docs/version-1.0/30-administration/22-backends/20-local.md +++ b/docs/versioned_docs/version-1.0/30-administration/22-backends/20-local.md @@ -115,4 +115,3 @@ labels: steps: [...] ``` - diff --git a/docs/versioned_docs/version-1.0/30-administration/40-encryption.md b/docs/versioned_docs/version-1.0/30-administration/40-encryption.md index 78aab91304..e48ece3eec 100644 --- a/docs/versioned_docs/version-1.0/30-administration/40-encryption.md +++ b/docs/versioned_docs/version-1.0/30-administration/40-encryption.md @@ -1,6 +1,6 @@ # Secrets encryption -By default, Woodpecker does not encrypt secrets in its database. You can enable encryption +By default, Woodpecker does not encrypt secrets in its database. You can enable encryption using simple AES key or more advanced [Google TINK](https://developers.google.com/tink) encryption. ## Common @@ -8,7 +8,7 @@ using simple AES key or more advanced [Google TINK](https://developers.google.co ### Enabling secrets encryption To enable secrets encryption and encrypt all existing secrets in database set -`WOODPECKER_ENCRYPTION_KEY`, `WOODPECKER_ENCRYPTION_KEY_FILE` or `WOODPECKER_ENCRYPTION_TINK_KEYSET_PATH` environment +`WOODPECKER_ENCRYPTION_KEY`, `WOODPECKER_ENCRYPTION_KEY_FILE` or `WOODPECKER_ENCRYPTION_TINK_KEYSET_PATH` environment variable depending on encryption method of your choice. After encryption is enabled you will be unable to start Woodpecker server without providing valid encryption key! @@ -45,7 +45,7 @@ You will need plaintext AEAD-compatible Google TINK keyset to encrypt your data. To generate it and then rotate keys if needed, install `tinkey`([installation guide](https://developers.google.com/tink/install-tinkey)) -Keyset contains one or more keys, used to encrypt or decrypt your data, and primary key ID, used to determine which key +Keyset contains one or more keys, used to encrypt or decrypt your data, and primary key ID, used to determine which key to use while encrypting new data. Keyset generation example: diff --git a/docs/versioned_docs/version-1.0/40-cli.md b/docs/versioned_docs/version-1.0/40-cli.md index 3f4b46c1e0..4829d84e1b 100644 --- a/docs/versioned_docs/version-1.0/40-cli.md +++ b/docs/versioned_docs/version-1.0/40-cli.md @@ -304,37 +304,37 @@ execute a local pipeline **--backend-ssh-user**="": backend ssh user -**--commit-author-avatar**="": +**--commit-author-avatar**="": -**--commit-author-email**="": +**--commit-author-email**="": -**--commit-author-name**="": +**--commit-author-name**="": -**--commit-branch**="": +**--commit-branch**="": -**--commit-message**="": +**--commit-message**="": -**--commit-ref**="": +**--commit-ref**="": -**--commit-refspec**="": +**--commit-refspec**="": -**--commit-sha**="": +**--commit-sha**="": -**--env**="": +**--env**="": -**--forge-type**="": +**--forge-type**="": -**--forge-url**="": +**--forge-url**="": **--local**: run from local directory **--log-level**="": set logging level (default: info) -**--netrc-machine**="": +**--netrc-machine**="": -**--netrc-password**="": +**--netrc-password**="": -**--netrc-username**="": +**--netrc-username**="": **--network**="": external networks @@ -344,7 +344,7 @@ execute a local pipeline **--pipeline-finished**="": (default: 0) -**--pipeline-link**="": +**--pipeline-link**="": **--pipeline-number**="": (default: 0) @@ -352,53 +352,53 @@ execute a local pipeline **--pipeline-started**="": (default: 0) -**--pipeline-status**="": +**--pipeline-status**="": -**--pipeline-target**="": +**--pipeline-target**="": -**--prev-commit-author-avatar**="": +**--prev-commit-author-avatar**="": -**--prev-commit-author-email**="": +**--prev-commit-author-email**="": -**--prev-commit-author-name**="": +**--prev-commit-author-name**="": -**--prev-commit-branch**="": +**--prev-commit-branch**="": -**--prev-commit-message**="": +**--prev-commit-message**="": -**--prev-commit-ref**="": +**--prev-commit-ref**="": -**--prev-commit-refspec**="": +**--prev-commit-refspec**="": -**--prev-commit-sha**="": +**--prev-commit-sha**="": **--prev-pipeline-created**="": (default: 0) -**--prev-pipeline-event**="": +**--prev-pipeline-event**="": **--prev-pipeline-finished**="": (default: 0) -**--prev-pipeline-link**="": +**--prev-pipeline-link**="": **--prev-pipeline-number**="": (default: 0) **--prev-pipeline-started**="": (default: 0) -**--prev-pipeline-status**="": +**--prev-pipeline-status**="": **--privileged**="": privileged plugins (default: "plugins/docker", "plugins/gcr", "plugins/ecr", "woodpeckerci/plugin-docker-buildx") **--repo**="": full repo name -**--repo-clone-url**="": +**--repo-clone-url**="": -**--repo-link**="": +**--repo-link**="": -**--repo-private**="": +**--repo-private**="": -**--repo-remote-id**="": +**--repo-remote-id**="": -**--repo-trusted**: +**--repo-trusted**: **--server, -s**="": server address @@ -408,7 +408,7 @@ execute a local pipeline **--system-name**="": (default: woodpecker) -**--system-platform**="": +**--system-platform**="": **--timeout**="": pipeline timeout (default: 0s) diff --git a/docs/versioned_docs/version-1.0/92-development/03-ui.md b/docs/versioned_docs/version-1.0/92-development/03-ui.md index b2a1248472..df121e4e18 100644 --- a/docs/versioned_docs/version-1.0/92-development/03-ui.md +++ b/docs/versioned_docs/version-1.0/92-development/03-ui.md @@ -32,7 +32,7 @@ The following list contains some tools and frameworks used by the Woodpecker UI. ## Messages and Translations -Woodpecker uses [Vue I18n](https://vue-i18n.intlify.dev/) as translation library. New translations have to be added to `web/src/assets/locales/en.json`. The English source file will be automatically imported into [Weblate](https://translate.woodpecker-ci.org/) (the translation system used by Woodpecker) where all other languages will be translated by the community based on the English source. +Woodpecker uses [Vue I18n](https://vue-i18n.intlify.dev/) as translation library. New translations have to be added to `web/src/assets/locales/en.json`. The English source file will be automatically imported into [Weblate](https://translate.woodpecker-ci.org/) (the translation system used by Woodpecker) where all other languages will be translated by the community based on the English source. You must not provide translations except English in PRs, otherwise weblate could put git into conflicts (when someone has translated in that language file and changes are not into master branch yet) For more information about translations see [Translations](./07-translations.md). diff --git a/docs/versioned_docs/version-1.0/92-development/09-security.md b/docs/versioned_docs/version-1.0/92-development/09-security.md index e8b2d95f25..86f925c077 100644 --- a/docs/versioned_docs/version-1.0/92-development/09-security.md +++ b/docs/versioned_docs/version-1.0/92-development/09-security.md @@ -1,6 +1,6 @@ # Security -We take security seriously. +We take security seriously. If you discover a security issue, please bring it to their attention right away! ### Reporting a Vulnerability diff --git a/docs/versioned_docs/version-1.0/92-development/ui-proxy.svg b/docs/versioned_docs/version-1.0/92-development/ui-proxy.svg index 6ccb744587..79809ffa19 100644 --- a/docs/versioned_docs/version-1.0/92-development/ui-proxy.svg +++ b/docs/versioned_docs/version-1.0/92-development/ui-proxy.svg @@ -1,6 +1,6 @@ - + - forward requestin dev modeUI Server Port 8010Woodpecker ServerBrowserPort 8000/login/logout/api/.../api/web-config.js/streamEvery other request(404 Handler) \ No newline at end of file + forward requestin dev modeUI Server Port 8010Woodpecker ServerBrowserPort 8000/login/logout/api/.../api/web-config.js/streamEvery other request(404 Handler) diff --git a/web/public/favicons/favicon-dark-error.svg b/web/public/favicons/favicon-dark-error.svg index 334808ae24..8ad3722c66 100644 --- a/web/public/favicons/favicon-dark-error.svg +++ b/web/public/favicons/favicon-dark-error.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/web/public/favicons/favicon-dark-pending.svg b/web/public/favicons/favicon-dark-pending.svg index efa389fa1b..d6fb79becf 100644 --- a/web/public/favicons/favicon-dark-pending.svg +++ b/web/public/favicons/favicon-dark-pending.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/web/public/favicons/favicon-dark-success.svg b/web/public/favicons/favicon-dark-success.svg index 92b8b6a1d2..a587b985ca 100644 --- a/web/public/favicons/favicon-dark-success.svg +++ b/web/public/favicons/favicon-dark-success.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/web/public/favicons/favicon-light-default.svg b/web/public/favicons/favicon-light-default.svg index 1f4eb14f74..43acef1176 100644 --- a/web/public/favicons/favicon-light-default.svg +++ b/web/public/favicons/favicon-light-default.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/web/public/favicons/favicon-light-error.svg b/web/public/favicons/favicon-light-error.svg index 6bedff96e7..7bd863ccde 100644 --- a/web/public/favicons/favicon-light-error.svg +++ b/web/public/favicons/favicon-light-error.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/web/public/favicons/favicon-light-pending.svg b/web/public/favicons/favicon-light-pending.svg index 5e2b99af6a..d7e651d8e4 100644 --- a/web/public/favicons/favicon-light-pending.svg +++ b/web/public/favicons/favicon-light-pending.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/web/public/favicons/favicon-light-success.svg b/web/public/favicons/favicon-light-success.svg index e2932a2e0d..21adb61924 100644 --- a/web/public/favicons/favicon-light-success.svg +++ b/web/public/favicons/favicon-light-success.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/woodpecker-go/LICENSE b/woodpecker-go/LICENSE index 8ca4ece965..85a3fa9a1f 100644 --- a/woodpecker-go/LICENSE +++ b/woodpecker-go/LICENSE @@ -199,4 +199,3 @@ Apache License WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - From d9c4b80826537dcd505f5ab42023f30b3bb608f3 Mon Sep 17 00:00:00 2001 From: pat-s Date: Tue, 31 Oct 2023 11:56:10 +0100 Subject: [PATCH 3/4] lint --- .markdownlint.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.markdownlint.yaml b/.markdownlint.yaml index 83be56f64d..7e3dc6a575 100644 --- a/.markdownlint.yaml +++ b/.markdownlint.yaml @@ -10,11 +10,11 @@ extends: null # MD003/heading-style/header-style - Heading style MD003: # Heading style - style: "atx" + style: 'atx' # MD004/ul-style - Unordered list style MD004: - style: "dash" + style: 'dash' # MD007/ul-indent - Unordered list indentation MD007: @@ -85,12 +85,12 @@ MD025: # MD026/no-trailing-punctuation - Trailing punctuation in heading MD026: # Punctuation characters - punctuation: ".,;:!。，；：！" + punctuation: '.,;:!。，；：！' # MD029/ol-prefix - Ordered list item prefix MD029: # List style - style: "one_or_ordered" + style: 'one_or_ordered' # MD030/list-marker-space - Spaces after list markers MD030: @@ -111,12 +111,12 @@ MD033: # MD035/hr-style - Horizontal rule style MD035: # Horizontal rule style - style: "---" + style: '---' # MD036/no-emphasis-as-heading/no-emphasis-as-header - Emphasis used instead of a heading MD036: # Punctuation characters - punctuation: ".,;:!?。，；：！？" + punctuation: '.,;:!?。，；：！？' # MD041/first-line-heading/first-line-h1 - First line in a file should be a top-level heading MD041: @@ -135,9 +135,9 @@ MD044: # MD046/code-block-style - Code block style MD046: # Block style - style: "fenced" + style: 'fenced' # MD048/code-fence-style - Code fence style MD048: # Code fence syle - style: "backtick" + style: 'backtick' From edfc3f18f76a5ecffc4b73223f5a6a0d13edd41e Mon Sep 17 00:00:00 2001 From: qwerty287 Date: Tue, 31 Oct 2023 12:22:18 +0100 Subject: [PATCH 4/4] Also update other docker okgs --- go.mod | 4 ++-- go.sum | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index d1e9ebe01c..7a5dd36675 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/caddyserver/certmagic v0.19.2 github.com/cenkalti/backoff/v4 v4.2.1 github.com/distribution/reference v0.5.0 - github.com/docker/cli v23.0.7+incompatible + github.com/docker/cli v24.0.7+incompatible github.com/docker/docker v24.0.7+incompatible github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.5.0 @@ -32,7 +32,7 @@ require ( github.com/joho/godotenv v1.5.1 github.com/lib/pq v1.10.9 github.com/mattn/go-sqlite3 v1.14.17 - github.com/moby/moby v23.0.7+incompatible + github.com/moby/moby v24.0.7+incompatible github.com/moby/term v0.5.0 github.com/oklog/ulid/v2 v2.1.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 18e1bcbe7e..8ed15c6676 100644 --- a/go.sum +++ b/go.sum @@ -64,12 +64,10 @@ github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDror github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/cli v23.0.7+incompatible h1:b+cDxRx/f6P1JR6asBXJOneubySm4nE8CB1B/3g59Sw= -github.com/docker/cli v23.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg= +github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v23.0.7+incompatible h1:6RD6ZfR9LYacFt90L41R/6/SyO+RZ1zWU7+bt6tdRNk= -github.com/docker/docker v23.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= @@ -302,8 +300,8 @@ github.com/mholt/acmez v1.2.0 h1:1hhLxSgY5FvH5HCnGUuwbKY2VQVo8IU7rxXKSnZ7F30= github.com/mholt/acmez v1.2.0/go.mod h1:VT9YwH1xgNX1kmYY89gY8xPJC84BFAisjo8Egigt4kE= github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo= github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY= -github.com/moby/moby v23.0.7+incompatible h1:g0V6QLBeYUcZq4tSHdzkTXQCxIs4PvxItxRo27sVqR0= -github.com/moby/moby v23.0.7+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= +github.com/moby/moby v24.0.7+incompatible h1:RrVT5IXBn85mRtFKP+gFwVLCcnNPZIgN3NVRJG9Le+4= +github.com/moby/moby v24.0.7+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=