Merge remote-tracking branch 'upstream/master'

2024-11-26 20:01:02 +00:00 · 2021-05-25 16:43:03 +02:00 · 2021-05-25 16:43:03 +02:00 · f694d6f2e4
commit f694d6f2e4
parent c47251bcf9 b48b8013df
220 changed files with 1371 additions and 480 deletions
--- a/.cli.sh
+++ b/.cli.sh
@ -6,11 +6,11 @@ set -x
 export CGO_ENABLED=0

 # compile for all architectures
-GOOS=linux   GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/amd64/woodpecker   github.com/laszlocph/woodpecker/cli/drone
-GOOS=linux   GOARCH=arm64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm64/woodpecker   github.com/laszlocph/woodpecker/cli/drone
-GOOS=linux   GOARCH=arm   go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm/woodpecker     github.com/laszlocph/woodpecker/cli/drone
-GOOS=windows GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/windows/amd64/woodpecker github.com/laszlocph/woodpecker/cli/drone
-GOOS=darwin  GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/darwin/amd64/woodpecker  github.com/laszlocph/woodpecker/cli/drone
+GOOS=linux   GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/amd64/woodpecker   github.com/woodpecker-ci/woodpecker/cli/drone
+GOOS=linux   GOARCH=arm64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm64/woodpecker   github.com/woodpecker-ci/woodpecker/cli/drone
+GOOS=linux   GOARCH=arm   go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm/woodpecker     github.com/woodpecker-ci/woodpecker/cli/drone
+GOOS=windows GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/windows/amd64/woodpecker github.com/woodpecker-ci/woodpecker/cli/drone
+GOOS=darwin  GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/darwin/amd64/woodpecker  github.com/woodpecker-ci/woodpecker/cli/drone

 # tar binary files prior to upload
 tar -cvzf cli/release/woodpecker_linux_amd64.tar.gz   -C cli/release/linux/amd64   woodpecker
--- a/.drone.sh
+++ b/.drone.sh
@ -11,5 +11,5 @@ fi

 echo "Building $VERSION"

-go build -ldflags '-extldflags "-static" -X github.com/laszlocph/woodpecker/version.Version='${VERSION} -o release/drone-server github.com/laszlocph/woodpecker/cmd/drone-server
-GOOS=linux GOARCH=amd64 CGO_ENABLED=0         go build -ldflags '-X github.com/laszlocph/woodpecker/version.Version='${VERSION} -o release/drone-agent             github.com/laszlocph/woodpecker/cmd/drone-agent
+go build -ldflags '-extldflags "-static" -X github.com/woodpecker-ci/woodpecker/version.Version='${VERSION} -o release/drone-server github.com/woodpecker-ci/woodpecker/cmd/drone-server
+GOOS=linux GOARCH=amd64 CGO_ENABLED=0         go build -ldflags '-X github.com/woodpecker-ci/woodpecker/version.Version='${VERSION} -o release/drone-agent             github.com/woodpecker-ci/woodpecker/cmd/drone-agent
--- a/.drone.yml
+++ b/.drone.yml
@ -26,7 +26,7 @@ pipeline:
      - DATABASE_DRIVER=postgres
      - DATABASE_CONFIG=host=postgres user=postgres dbname=postgres sslmode=disable
    commands:
-      - go test -timeout 30s github.com/laszlocph/woodpecker/store/datastore
+      - go test -timeout 30s github.com/woodpecker-ci/woodpecker/store/datastore

  test-mysql:
    image: golang:1.16
@ -35,7 +35,7 @@ pipeline:
      - DATABASE_DRIVER=mysql
      - DATABASE_CONFIG=root@tcp(mysql:3306)/test?parseTime=true
    commands:
-      - go test -timeout 30s github.com/laszlocph/woodpecker/store/datastore
+      - go test -timeout 30s github.com/woodpecker-ci/woodpecker/store/datastore

  build-frontend:
    image: node:10.17.0-stretch
@ -45,7 +45,7 @@ pipeline:
  build:
    image: golang:1.16
    commands:
-      - go get github.com/laszlocph/togo
+      - go get github.com/woodpecker-ci/togo
      - (cd web/; go generate ./...)
      - ./.drone.sh
    when:
@ -53,7 +53,7 @@ pipeline:

  # publish-server-alpine:
  #   image: plugins/docker
-  #   repo: laszlocloud/woodpecker-server
+  #   repo: woodpeckerci/woodpecker-server
  #   dockerfile: Dockerfile.alpine
  #   secrets: [ docker_username, docker_password ]
  #   tag: [ alpine ]
@ -67,7 +67,7 @@ pipeline:

  publish-server:
    image: plugins/docker
-    repo: laszlocloud/woodpecker-server
+    repo: woodpeckerci/woodpecker-server
    secrets: [ docker_username, docker_password ]
    tag: [ latest ]
    when:
@ -76,7 +76,7 @@ pipeline:

  publish-agent:
    image: plugins/docker
-    repo: laszlocloud/woodpecker-agent
+    repo: woodpeckerci/woodpecker-agent
    dockerfile: Dockerfile.agent
    secrets: [ docker_username, docker_password ]
    tag: [ latest ]
@ -86,7 +86,7 @@ pipeline:

  # publish-agent-alpine:
  #   image: plugins/docker
-  #   repo: laszlocloud/woodpecker-agent
+  #   repo: woodpeckerci/woodpecker-agent
  #   dockerfile: Dockerfile.agent.alpine
  #   secrets: [ docker_username, docker_password ]
  #   tag: [ alpine ]
@ -96,7 +96,7 @@ pipeline:

 #  release-server-alpine:
 #    image: plugins/docker
-#    repo: laszlocloud/woodpecker-server
+#    repo: woodpeckerci/woodpecker-server
 #    dockerfile: Dockerfile.alpine
 #    secrets: [ docker_username, docker_password ]
 #    tag: "${DRONE_TAG}-alpine"
@ -105,7 +105,7 @@ pipeline:
 #
 #  release-agent-alpine:
 #    image: plugins/docker
-#    repo: laszlocloud/woodpecker-agent
+#    repo: woodpeckerci/woodpecker-agent
 #    dockerfile: Dockerfile.agent.alpine
 #    secrets: [ docker_username, docker_password ]
 #    tag: "${DRONE_TAG}-alpine"
@ -114,7 +114,7 @@ pipeline:

  release-server:
    image: plugins/docker
-    repo: laszlocloud/woodpecker-server
+    repo: woodpeckerci/woodpecker-server
    secrets: [ docker_username, docker_password ]
    tag: ${DRONE_TAG}
    when:
@ -122,7 +122,7 @@ pipeline:

  release-agent:
    image: plugins/docker
-    repo: laszlocloud/woodpecker-agent
+    repo: woodpeckerci/woodpecker-agent
    dockerfile: Dockerfile.agent
    secrets: [ docker_username, docker_password ]
    tag: ${DRONE_TAG}
--- a/2
+++ b/2
@ -14,7 +14,7 @@ curl -o swagger -L'#' "$download_url"
 chmod +x swagger
 sudo mv swagger /usr/local/bin

-go get github.com/laszlocph/togo
+go get github.com/woodpecker-ci/togo

 go generate

--- a/20
+++ b/20
@ -22,28 +22,28 @@ format:
 	@gofmt -w ${GOFILES_NOVENDOR}

 test-agent:
-	$(DOCKER_RUN) go test -race -timeout 30s github.com/laszlocph/woodpecker/cmd/drone-agent $(go list ./... | grep -v /vendor/)
+	$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/drone-agent $(go list ./... | grep -v /vendor/)

 test-server:
-	$(DOCKER_RUN) go test -race -timeout 30s github.com/laszlocph/woodpecker/cmd/drone-server
+	$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/drone-server

 test-frontend:
 		(cd web/; yarn run test)

 test-lib:
-	go get github.com/laszlocph/woodpecker/cncd/pipeline/pipec
-	go get github.com/laszlocph/woodpecker/remote/mock
-	go get github.com/laszlocph/woodpecker/cli/drone/internal
-	go get -t github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml
+	go get github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipec
+	go get github.com/woodpecker-ci/woodpecker/remote/mock
+	go get github.com/woodpecker-ci/woodpecker/cli/drone/internal
+	go get -t github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml
 	$(DOCKER_RUN) go test -race -timeout 30s $(shell go list ./... | grep -v '/cmd/')

 test: test-lib test-agent test-server

 build-agent:
-	$(DOCKER_RUN) go build -o build/drone-agent github.com/laszlocph/woodpecker/cmd/drone-agent
+	$(DOCKER_RUN) go build -o build/drone-agent github.com/woodpecker-ci/woodpecker/cmd/drone-agent

 build-server:
-	$(DOCKER_RUN) go build -o build/drone-server github.com/laszlocph/woodpecker/cmd/drone-server
+	$(DOCKER_RUN) go build -o build/drone-server github.com/woodpecker-ci/woodpecker/cmd/drone-server

 build-frontend:
 	(cd web/; yarn run build)
@ -52,5 +52,5 @@ build-frontend:
 build: build-agent build-server

 install:
-	go install github.com/laszlocph/woodpecker/cmd/drone-agent
-	go install github.com/laszlocph/woodpecker/cmd/drone-server
+	go install github.com/woodpecker-ci/woodpecker/cmd/drone-agent
+	go install github.com/woodpecker-ci/woodpecker/cmd/drone-server
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ A fork of the Drone CI system.
 - Based on the v0.8 code tree
 - Fully Apache 2.0, no tiers

-[![Go Report Card](https://goreportcard.com/badge/github.com/laszlocph/woodpecker)](https://goreportcard.com/report/github.com/laszlocph/woodpecker) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Go Report Card](https://goreportcard.com/badge/github.com/woodpecker-ci/woodpecker)](https://goreportcard.com/report/github.com/woodpecker-ci/woodpecker) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![https://discord.gg/fcMQqSMXJy](https://img.shields.io/discord/838698813463724034.svg)](https://discord.gg/fcMQqSMXJy)

 ![woodpecker](docs/docs/images/woodpecker.png)

@ -95,7 +95,7 @@ https://woodpecker.laszlo.cloud

 Currently, I know of one organization using this fork. With 50+ users, 130+ repos and more than 1100 builds a week.

-Leave a note here if you are using it: https://github.com/laszlocph/woodpecker/issues/122
+Leave a note here if you are using it: https://github.com/woodpecker-ci/woodpecker/issues/122

 ## License

--- a/charts/README.md
+++ b/charts/README.md
@ -0,0 +1,49 @@
+# Woodpecker
+
+[Woodpecker](https://woodpecker.laszlo.cloud/) is a fork of the Drone CI system version 0.8, right before the 1.0 release and license changes
+
+## Installing Woodpecker server
+
+### Requirements
+
+```
+kubectl create secret generic drone-secret \
+  --namespace sre \
+  --from-literal=DRONE_SECRET=$(openssl rand -hex 32)
+```
+
+[GitHub](https://woodpecker.laszlo.cloud/administration/github/)
+
+```
+kubectl create secret generic drone-github-client \
+  --namespace <namespace> \
+  --from-literal=DRONE_GITHUB_CLIENT=xxxxxxxx
+```
+
+```
+kubectl create secret generic drone-github-secret \
+  --namespace <namespace> \
+  --from-literal=DRONE_GITHUB_SECRET=xxxxxxxx
+```
+
+```
+helm upgrade --install woodpecker-server --namespace <namespace> woodpecker-server/
+```
+
+
+## Installing Woodpecker agent
+
+```
+helm upgrade --install woodpecker-agent --namespace <namespace> woodpecker-agent/
+```
+
+## Uninstall
+
+```
+helm delete woodpecker-agent
+helm delete woodpecker-server
+```
+
+## Support
+
+For questions, suggestions, and discussion, visit the [Discord](https://discord.gg/fcMQqSMXJy).
--- a/charts/woodpecker-agent/.helmignore
+++ b/charts/woodpecker-agent/.helmignore
@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
--- a/charts/woodpecker-agent/Chart.yaml
+++ b/charts/woodpecker-agent/Chart.yaml
@ -0,0 +1,17 @@
+apiVersion: v2
+name: woodpecker-agent
+description: A Helm chart for Woodpecker a fork of the Drone CI system
+type: application
+version: 0.1.0
+appVersion: "v0.13.0-rc.3"
+keywords:
+- continuous-delivery
+- continuous-deployment
+- continuous-integration
+- docker
+- go
+sources:
+- https://github.com/woodpecker-ci/woodpecker
+maintainers:
+- name: Laszlo Fogas
+  email: laszlo@laszlo.cloud
--- a/charts/woodpecker-agent/templates/_helpers.tpl
+++ b/charts/woodpecker-agent/templates/_helpers.tpl
@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "woodpecker-agent.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "woodpecker-agent.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "woodpecker-agent.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "woodpecker-agent.labels" -}}
+helm.sh/chart: {{ include "woodpecker-agent.chart" . }}
+{{ include "woodpecker-agent.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "woodpecker-agent.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "woodpecker-agent.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "woodpecker-agent.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "woodpecker-agent.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
--- a/charts/woodpecker-agent/templates/deployment.yaml
+++ b/charts/woodpecker-agent/templates/deployment.yaml
@ -0,0 +1,79 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "woodpecker-agent.fullname" . }}
+  labels:
+    {{- include "woodpecker-agent.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "woodpecker-agent.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "woodpecker-agent.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "woodpecker-agent.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 3000
+              protocol: TCP
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - name: sock-dir
+              mountPath: /var/run
+          env:
+            {{- range $key, $value := .Values.env }}
+            - name: {{ $key }}
+              value: {{ $value | quote }}
+            {{- end }}
+          envFrom:
+            {{- range .Values.extraSecretNamesForEnvFrom }}
+            - secretRef:
+                name: {{ . }}
+            {{- end }}
+        - name: dind
+          image: "docker:19.03.5-dind"
+          env:
+          - name: DOCKER_DRIVER
+            value: overlay2
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          securityContext:
+            privileged: true
+          volumeMounts:
+          - name: sock-dir
+            mountPath: /var/run
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+      - name: sock-dir
+        emptyDir: {}
--- a/charts/woodpecker-agent/templates/serviceaccount.yaml
+++ b/charts/woodpecker-agent/templates/serviceaccount.yaml
@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "woodpecker-agent.serviceAccountName" . }}
+  labels:
+    {{- include "woodpecker-agent.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
--- a/charts/woodpecker-agent/values.yaml
+++ b/charts/woodpecker-agent/values.yaml
@ -0,0 +1,58 @@
+replicaCount: 2
+
+image:
+  registry: docker.io
+  repository: laszlocloud/woodpecker-agent
+  pullPolicy: Always
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+env:
+  DRONE_SERVER: "woodpecker-server.<namespace>.svc.cluster.local:9000"
+
+extraSecretNamesForEnvFrom:
+- drone-secret
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
--- a/charts/woodpecker-server/.helmignore
+++ b/charts/woodpecker-server/.helmignore
@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
--- a/charts/woodpecker-server/Chart.yaml
+++ b/charts/woodpecker-server/Chart.yaml
@ -0,0 +1,17 @@
+apiVersion: v2
+name: woodpecker-server
+description: A Helm chart for Woodpecker a fork of the Drone CI system
+type: application
+version: 0.1.0
+appVersion: "v0.13.0-rc.3"
+keywords:
+- continuous-delivery
+- continuous-deployment
+- continuous-integration
+- docker
+- go
+sources:
+- https://github.com/woodpecker-ci/woodpecker
+maintainers:
+- name: Laszlo Fogas
+  email: laszlo@laszlo.cloud
--- a/charts/woodpecker-server/templates/NOTES.txt
+++ b/charts/woodpecker-server/templates/NOTES.txt
@ -0,0 +1,22 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
+  {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "woodpecker-server.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "woodpecker-server.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "woodpecker-server.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "woodpecker-server.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
--- a/charts/woodpecker-server/templates/_helpers.tpl
+++ b/charts/woodpecker-server/templates/_helpers.tpl
@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "woodpecker-server.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "woodpecker-server.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "woodpecker-server.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "woodpecker-server.labels" -}}
+helm.sh/chart: {{ include "woodpecker-server.chart" . }}
+{{ include "woodpecker-server.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "woodpecker-server.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "woodpecker-server.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "woodpecker-server.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "woodpecker-server.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
--- a/charts/woodpecker-server/templates/deployment.yaml
+++ b/charts/woodpecker-server/templates/deployment.yaml
@ -0,0 +1,79 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "woodpecker-server.fullname" . }}
+  labels:
+    {{- include "woodpecker-server.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "woodpecker-server.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        prometheus.io/scrape: 'true'
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "woodpecker-server.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "woodpecker-server.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 8000
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8000
+          readinessProbe:
+            httpGet:
+              path: /healthz
+              port: 8000
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+          - name: storage-volume
+            mountPath: {{ .Values.persistentVolume.mountPath }}
+          env:
+            {{- range $key, $value := .Values.env }}
+            - name: {{ $key }}
+              value: {{ $value | quote }}
+            {{- end }}
+          envFrom:
+            {{- range .Values.extraSecretNamesForEnvFrom }}
+            - secretRef:
+                name: {{ . }}
+            {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+      - name: storage-volume
+        {{- if .Values.persistentVolume.enabled }}
+        persistentVolumeClaim:
+          claimName: {{ if .Values.persistentVolume.existingClaim }}{{ .Values.persistentVolume.existingClaim }}{{- else }}{{ template "woodpecker-server.fullname" . }}{{- end }}
+        {{- end -}}
--- a/charts/woodpecker-server/templates/ingress.yaml
+++ b/charts/woodpecker-server/templates/ingress.yaml
@ -0,0 +1,40 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "woodpecker-server.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "woodpecker-server.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+          {{- end }}
+    {{- end }}
+  {{- end }}
--- a/charts/woodpecker-server/templates/persistentvolumeclaim.yaml
+++ b/charts/woodpecker-server/templates/persistentvolumeclaim.yaml
@ -0,0 +1,17 @@
+{{- if .Values.persistentVolume.enabled -}}
+{{- if not .Values.persistentVolume.existingClaim -}}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "woodpecker-server.fullname" . }}
+  labels:
+  {{- include "woodpecker-server.labels" . | nindent 4 }}
+spec:
+  accessModes:
+  - ReadWriteOnce
+  storageClassName: "{{ .Values.persistentVolume.storageClass }}"
+  resources:
+    requests:
+      storage: "{{ .Values.persistentVolume.size }}"
+{{- end -}}
+{{- end -}}
--- a/charts/woodpecker-server/templates/service.yaml
+++ b/charts/woodpecker-server/templates/service.yaml
@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "woodpecker-server.fullname" . }}
+  labels:
+    {{- include "woodpecker-server.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - protocol: TCP
+      name: http
+      port: {{ .Values.service.port }}
+      targetPort: 8000
+    - protocol: TCP
+      name: grpc
+      port: 9000
+      targetPort: 9000
+  selector:
+    {{- include "woodpecker-server.selectorLabels" . | nindent 4 }}
--- a/charts/woodpecker-server/templates/serviceaccount.yaml
+++ b/charts/woodpecker-server/templates/serviceaccount.yaml
@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "woodpecker-server.serviceAccountName" . }}
+  labels:
+    {{- include "woodpecker-server.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
--- a/charts/woodpecker-server/values.yaml
+++ b/charts/woodpecker-server/values.yaml
@ -0,0 +1,89 @@
+replicaCount: 1
+
+image:
+  registry: docker.io
+  repository: laszlocloud/woodpecker-server
+  pullPolicy: Always
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+env:
+  DRONE_ADMIN: "xxxx"
+  DRONE_HOST: https://"xxxxxxx"
+  DRONE_GITHUB: true
+
+extraSecretNamesForEnvFrom:
+- drone-github-client
+- drone-github-secret
+- drone-secret
+
+persistentVolume:
+  enabled: true
+  size: 10Gi
+  mountPath: "/var/lib/drone"
+  storageClass: "gp2"
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations:
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+      - path: /
+        backend:
+          serviceName: chart-example.local
+          servicePort: 80
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
--- a/cli/drone/build/build_approve.go
+++ b/cli/drone/build/build_approve.go
@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/build/build_decline.go
+++ b/cli/drone/build/build_decline.go
@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/build/build_info.go
+++ b/cli/drone/build/build_info.go
@ -5,7 +5,7 @@ import (
 	"strconv"
 	"text/template"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/build/build_kill.go
+++ b/cli/drone/build/build_kill.go
@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/build/build_last.go
+++ b/cli/drone/build/build_last.go
@ -4,7 +4,7 @@ import (
 	"os"
 	"text/template"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/build/build_list.go
+++ b/cli/drone/build/build_list.go
@ -4,7 +4,7 @@ import (
 	"os"
 	"text/template"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/build/build_ps.go
+++ b/cli/drone/build/build_ps.go
@ -5,7 +5,7 @@ import (
 	"strconv"
 	"text/template"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/build/build_queue.go
+++ b/cli/drone/build/build_queue.go
@ -5,7 +5,7 @@ import (
 	"os"
 	"text/template"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/build/build_start.go
+++ b/cli/drone/build/build_start.go
@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/build/build_stop.go
+++ b/cli/drone/build/build_stop.go
@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/deploy/deploy.go
+++ b/cli/drone/deploy/deploy.go
@ -6,8 +6,8 @@ import (
 	"os"
 	"strconv"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
-	"github.com/laszlocph/woodpecker/drone-go/drone"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/drone-go/drone"

 	"github.com/urfave/cli"
 )
--- a/cli/drone/exec/exec.go
+++ b/cli/drone/exec/exec.go
@ -14,16 +14,16 @@ import (
 	"time"

 	"github.com/drone/envsubst"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend/docker"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/compiler"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/linter"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/matrix"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/interrupt"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/multipart"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend/docker"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/compiler"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/linter"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/matrix"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/interrupt"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart"

 	"github.com/urfave/cli"
 )
--- a/cli/drone/info/info.go
+++ b/cli/drone/info/info.go
@ -6,7 +6,7 @@ import (

 	"github.com/urfave/cli"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 )

 // Command exports the info command.
--- a/cli/drone/internal/util.go
+++ b/cli/drone/internal/util.go
@ -11,7 +11,7 @@ import (
 	"golang.org/x/net/proxy"
 	"golang.org/x/oauth2"

-	"github.com/laszlocph/woodpecker/drone-go/drone"
+	"github.com/woodpecker-ci/woodpecker/drone-go/drone"
 )

 // NewClient returns a new client from the CLI context.
--- a/cli/drone/log/log_purge.go
+++ b/cli/drone/log/log_purge.go
@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/main.go
+++ b/cli/drone/main.go
@ -4,15 +4,15 @@ import (
 	"fmt"
 	"os"

-	"github.com/laszlocph/woodpecker/cli/drone/build"
-	"github.com/laszlocph/woodpecker/cli/drone/deploy"
-	"github.com/laszlocph/woodpecker/cli/drone/exec"
-	"github.com/laszlocph/woodpecker/cli/drone/info"
-	"github.com/laszlocph/woodpecker/cli/drone/log"
-	"github.com/laszlocph/woodpecker/cli/drone/registry"
-	"github.com/laszlocph/woodpecker/cli/drone/repo"
-	"github.com/laszlocph/woodpecker/cli/drone/secret"
-	"github.com/laszlocph/woodpecker/cli/drone/user"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/build"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/deploy"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/exec"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/info"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/log"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/registry"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/repo"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/secret"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/user"

 	_ "github.com/joho/godotenv/autoload"
 	"github.com/urfave/cli"
--- a/cli/drone/registry/registry_add.go
+++ b/cli/drone/registry/registry_add.go
@ -4,8 +4,8 @@ import (
 	"io/ioutil"
 	"strings"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
-	"github.com/laszlocph/woodpecker/drone-go/drone"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/drone-go/drone"

 	"github.com/urfave/cli"
 )
--- a/cli/drone/registry/registry_info.go
+++ b/cli/drone/registry/registry_info.go
@ -4,7 +4,7 @@ import (
 	"html/template"
 	"os"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"

 	"github.com/urfave/cli"
 )
--- a/cli/drone/registry/registry_list.go
+++ b/cli/drone/registry/registry_list.go
@ -6,7 +6,7 @@ import (

 	"github.com/urfave/cli"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 )

 var registryListCmd = cli.Command{
--- a/cli/drone/registry/registry_rm.go
+++ b/cli/drone/registry/registry_rm.go
@ -1,7 +1,7 @@
 package registry

 import (
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"

 	"github.com/urfave/cli"
 )
--- a/cli/drone/registry/registry_set.go
+++ b/cli/drone/registry/registry_set.go
@ -4,8 +4,8 @@ import (
 	"io/ioutil"
 	"strings"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
-	"github.com/laszlocph/woodpecker/drone-go/drone"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/drone-go/drone"

 	"github.com/urfave/cli"
 )
--- a/cli/drone/repo/repo_add.go
+++ b/cli/drone/repo/repo_add.go
@ -3,7 +3,7 @@ package repo
 import (
 	"fmt"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/repo/repo_chown.go
+++ b/cli/drone/repo/repo_chown.go
@ -3,7 +3,7 @@ package repo
 import (
 	"fmt"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/repo/repo_info.go
+++ b/cli/drone/repo/repo_info.go
@ -4,7 +4,7 @@ import (
 	"os"
 	"text/template"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/repo/repo_list.go
+++ b/cli/drone/repo/repo_list.go
@ -4,7 +4,7 @@ import (
 	"os"
 	"text/template"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/repo/repo_repair.go
+++ b/cli/drone/repo/repo_repair.go
@ -1,7 +1,7 @@
 package repo

 import (
-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/repo/repo_rm.go
+++ b/cli/drone/repo/repo_rm.go
@ -3,7 +3,7 @@ package repo
 import (
 	"fmt"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"

 	"github.com/urfave/cli"
 )
--- a/cli/drone/repo/repo_sync.go
+++ b/cli/drone/repo/repo_sync.go
@ -4,7 +4,7 @@ import (
 	"os"
 	"text/template"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 	"github.com/urfave/cli"
 )

--- a/cli/drone/repo/repo_update.go
+++ b/cli/drone/repo/repo_update.go
@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
-	"github.com/laszlocph/woodpecker/drone-go/drone"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/drone-go/drone"

 	"github.com/urfave/cli"
 )
--- a/cli/drone/secret/secret_add.go
+++ b/cli/drone/secret/secret_add.go
@ -4,8 +4,8 @@ import (
 	"io/ioutil"
 	"strings"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
-	"github.com/laszlocph/woodpecker/drone-go/drone"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/drone-go/drone"

 	"github.com/urfave/cli"
 )
--- a/cli/drone/secret/secret_info.go
+++ b/cli/drone/secret/secret_info.go
@ -6,7 +6,7 @@ import (

 	"github.com/urfave/cli"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 )

 var secretInfoCmd = cli.Command{
--- a/cli/drone/secret/secret_list.go
+++ b/cli/drone/secret/secret_list.go
@ -7,7 +7,7 @@ import (

 	"github.com/urfave/cli"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 )

 var secretListCmd = cli.Command{
--- a/cli/drone/secret/secret_rm.go
+++ b/cli/drone/secret/secret_rm.go
@ -3,7 +3,7 @@ package secret
 import (
 	"github.com/urfave/cli"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 )

 var secretDeleteCmd = cli.Command{
--- a/cli/drone/secret/secret_set.go
+++ b/cli/drone/secret/secret_set.go
@ -4,8 +4,8 @@ import (
 	"io/ioutil"
 	"strings"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
-	"github.com/laszlocph/woodpecker/drone-go/drone"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/drone-go/drone"

 	"github.com/urfave/cli"
 )
--- a/cli/drone/user/user_add.go
+++ b/cli/drone/user/user_add.go
@ -3,10 +3,10 @@ package user
 import (
 	"fmt"

-	"github.com/laszlocph/woodpecker/drone-go/drone"
+	"github.com/woodpecker-ci/woodpecker/drone-go/drone"
 	"github.com/urfave/cli"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 )

 var userAddCmd = cli.Command{
--- a/cli/drone/user/user_info.go
+++ b/cli/drone/user/user_info.go
@ -7,7 +7,7 @@ import (

 	"github.com/urfave/cli"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 )

 var userInfoCmd = cli.Command{
--- a/cli/drone/user/user_list.go
+++ b/cli/drone/user/user_list.go
@ -6,7 +6,7 @@ import (

 	"github.com/urfave/cli"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 )

 var userListCmd = cli.Command{
--- a/cli/drone/user/user_rm.go
+++ b/cli/drone/user/user_rm.go
@ -5,7 +5,7 @@ import (

 	"github.com/urfave/cli"

-	"github.com/laszlocph/woodpecker/cli/drone/internal"
+	"github.com/woodpecker-ci/woodpecker/cli/drone/internal"
 )

 var userRemoveCmd = cli.Command{
--- a/cmd/drone-agent/agent.go
+++ b/cmd/drone-agent/agent.go
@ -31,11 +31,11 @@ import (
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/metadata"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend/docker"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/multipart"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/rpc"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend/docker"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc"

 	"github.com/drone/signal"
 	"github.com/rs/zerolog"
--- a/cmd/drone-agent/health.go
+++ b/cmd/drone-agent/health.go
@ -22,7 +22,7 @@ import (
 	"sync"
 	"time"

-	"github.com/laszlocph/woodpecker/version"
+	"github.com/woodpecker-ci/woodpecker/version"
 	"github.com/urfave/cli"
 )

@ -48,7 +48,7 @@ func handleVersion(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(200)
 	w.Header().Add("Content-Type", "text/json")
 	json.NewEncoder(w).Encode(versionResp{
-		Source:  "https://github.com/laszlocph/woodpecker",
+		Source:  "https://github.com/woodpecker-ci/woodpecker",
 		Version: version.String(),
 	})
 }
--- a/cmd/drone-agent/main.go
+++ b/cmd/drone-agent/main.go
@ -19,7 +19,7 @@ import (
 	"os"
 	"time"

-	"github.com/laszlocph/woodpecker/version"
+	"github.com/woodpecker-ci/woodpecker/version"

 	_ "github.com/joho/godotenv/autoload"
 	"github.com/urfave/cli"
--- a/cmd/drone-server/main.go
+++ b/cmd/drone-server/main.go
@ -18,7 +18,7 @@ import (
 	"fmt"
 	"os"

-	"github.com/laszlocph/woodpecker/version"
+	"github.com/woodpecker-ci/woodpecker/version"

 	"github.com/joho/godotenv"
 	_ "github.com/joho/godotenv/autoload"
--- a/cmd/drone-server/server.go
+++ b/cmd/drone-server/server.go
@ -33,15 +33,15 @@ import (
 	"golang.org/x/crypto/acme/autocert"
 	"golang.org/x/sync/errgroup"

-	"github.com/laszlocph/woodpecker/cncd/logging"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/rpc/proto"
-	"github.com/laszlocph/woodpecker/cncd/pubsub"
-	"github.com/laszlocph/woodpecker/plugins/sender"
-	"github.com/laszlocph/woodpecker/remote"
-	"github.com/laszlocph/woodpecker/router"
-	"github.com/laszlocph/woodpecker/router/middleware"
-	droneserver "github.com/laszlocph/woodpecker/server"
-	"github.com/laszlocph/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/cncd/logging"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc/proto"
+	"github.com/woodpecker-ci/woodpecker/cncd/pubsub"
+	"github.com/woodpecker-ci/woodpecker/plugins/sender"
+	"github.com/woodpecker-ci/woodpecker/remote"
+	"github.com/woodpecker-ci/woodpecker/router"
+	"github.com/woodpecker-ci/woodpecker/router/middleware"
+	droneserver "github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/store"

 	"github.com/gin-gonic/contrib/ginrus"
 	"github.com/sirupsen/logrus"
--- a/cmd/drone-server/setup.go
+++ b/cmd/drone-server/setup.go
@ -19,24 +19,24 @@ import (
 	"time"

 	"github.com/dimfeld/httptreemux"
-	"github.com/laszlocph/woodpecker/cncd/queue"
-	"github.com/laszlocph/woodpecker/model"
-	"github.com/laszlocph/woodpecker/plugins/environments"
-	"github.com/laszlocph/woodpecker/plugins/registry"
-	"github.com/laszlocph/woodpecker/plugins/secrets"
-	"github.com/laszlocph/woodpecker/remote"
-	"github.com/laszlocph/woodpecker/remote/bitbucket"
-	"github.com/laszlocph/woodpecker/remote/bitbucketserver"
-	"github.com/laszlocph/woodpecker/remote/coding"
-	"github.com/laszlocph/woodpecker/remote/gitea"
-	"github.com/laszlocph/woodpecker/remote/github"
-	"github.com/laszlocph/woodpecker/remote/gitlab"
-	"github.com/laszlocph/woodpecker/remote/gitlab3"
-	"github.com/laszlocph/woodpecker/remote/gogs"
-	droneserver "github.com/laszlocph/woodpecker/server"
-	"github.com/laszlocph/woodpecker/server/web"
-	"github.com/laszlocph/woodpecker/store"
-	"github.com/laszlocph/woodpecker/store/datastore"
+	"github.com/woodpecker-ci/woodpecker/cncd/queue"
+	"github.com/woodpecker-ci/woodpecker/model"
+	"github.com/woodpecker-ci/woodpecker/plugins/environments"
+	"github.com/woodpecker-ci/woodpecker/plugins/registry"
+	"github.com/woodpecker-ci/woodpecker/plugins/secrets"
+	"github.com/woodpecker-ci/woodpecker/remote"
+	"github.com/woodpecker-ci/woodpecker/remote/bitbucket"
+	"github.com/woodpecker-ci/woodpecker/remote/bitbucketserver"
+	"github.com/woodpecker-ci/woodpecker/remote/coding"
+	"github.com/woodpecker-ci/woodpecker/remote/gitea"
+	"github.com/woodpecker-ci/woodpecker/remote/github"
+	"github.com/woodpecker-ci/woodpecker/remote/gitlab"
+	"github.com/woodpecker-ci/woodpecker/remote/gitlab3"
+	"github.com/woodpecker-ci/woodpecker/remote/gogs"
+	droneserver "github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/web"
+	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/store/datastore"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"golang.org/x/sync/errgroup"
--- a/cncd/logging/README
+++ b/cncd/logging/README
@ -2,5 +2,5 @@ Go package provides a common interface for storing and streaming logs.

 Documentation:

-    http://godoc.org/github.com/laszlocph/woodpecker/cncd/logging
-    http://godoc.org/github.com/laszlocph/woodpecker/cncd/logging/gcp
+    http://godoc.org/github.com/woodpecker-ci/woodpecker/cncd/logging
+    http://godoc.org/github.com/woodpecker-ci/woodpecker/cncd/logging/gcp
--- a/cncd/pipeline/.drone.yml
+++ b/cncd/pipeline/.drone.yml
@ -1,15 +1,15 @@
 workspace:
  base: /go
-  path: src/github.com/laszlocph/woodpecker/cncd/pipeline
+  path: src/github.com/woodpecker-ci/woodpecker/cncd/pipeline

 pipeline:
  install:
    image: golang:1.8
    commands:
-      - go install github.com/laszlocph/woodpecker/cncd/pipeline/pipec
-      - go install github.com/laszlocph/woodpecker/cncd/pipeline/piped
+      - go install github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipec
+      - go install github.com/woodpecker-ci/woodpecker/cncd/pipeline/piped

  test:
    image: golang:1.8
    commands:
-      - go test -cover -timeout 30s github.com/laszlocph/woodpecker/cncd/pipeline/...
+      - go test -cover -timeout 30s github.com/woodpecker-ci/woodpecker/cncd/pipeline/...
--- a/cncd/pipeline/pipec/compile.go
+++ b/cncd/pipeline/pipec/compile.go
@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"strings"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/compiler"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/compiler"

 	"github.com/urfave/cli"
 )
--- a/cncd/pipeline/pipec/exec.go
+++ b/cncd/pipeline/pipec/exec.go
@ -8,12 +8,12 @@ import (
 	"strconv"
 	"time"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend/docker"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend/kubernetes"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/interrupt"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/multipart"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend/docker"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend/kubernetes"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/interrupt"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart"
 	"github.com/urfave/cli"
 )

--- a/cncd/pipeline/pipec/lint.go
+++ b/cncd/pipeline/pipec/lint.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/linter"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/linter"

 	"github.com/kr/pretty"
 	"github.com/urfave/cli"
--- a/cncd/pipeline/piped/main.go
+++ b/cncd/pipeline/piped/main.go
@ -13,12 +13,12 @@ import (
 	"sync"
 	"time"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend/docker"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/interrupt"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/multipart"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/rpc"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend/docker"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/interrupt"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc"

 	_ "github.com/joho/godotenv/autoload"
 	"github.com/tevino/abool"
--- a/cncd/pipeline/piped/once.go
+++ b/cncd/pipeline/piped/once.go
@ -7,8 +7,8 @@ import (
 	"net/url"
 	"time"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/interrupt"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/rpc"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/interrupt"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc"

 	_ "github.com/joho/godotenv/autoload"
 	"github.com/urfave/cli"
--- a/cncd/pipeline/pipeline/backend/docker/convert.go
+++ b/cncd/pipeline/pipeline/backend/docker/convert.go
@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
 )

 // returns a container configuration.
--- a/cncd/pipeline/pipeline/backend/docker/docker.go
+++ b/cncd/pipeline/pipeline/backend/docker/docker.go
@ -8,7 +8,7 @@ import (
 	"io"
 	"os"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"

 	"docker.io/go-docker"
 	"docker.io/go-docker/api/types"
--- a/cncd/pipeline/pipeline/backend/docker/pool.go
+++ b/cncd/pipeline/pipeline/backend/docker/pool.go
@ -3,7 +3,7 @@ package docker
 // import (
 // 	"context"
 //
-// 	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
+// 	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
 // )
 //
 // // Pool manages a pool of Docker clients.
--- a/cncd/pipeline/pipeline/backend/kubernetes/kubernetes.go
+++ b/cncd/pipeline/pipeline/backend/kubernetes/kubernetes.go
@ -4,7 +4,7 @@ import (
 	"context"
 	"io"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
 )

 type engine struct {
--- a/cncd/pipeline/pipeline/frontend/yaml/compiler/cacher.go
+++ b/cncd/pipeline/pipeline/frontend/yaml/compiler/cacher.go
@ -4,7 +4,7 @@ import (
 	"path"
 	"strings"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"

 	libcompose "github.com/docker/libcompose/yaml"
 )
--- a/cncd/pipeline/pipeline/frontend/yaml/compiler/compiler.go
+++ b/cncd/pipeline/pipeline/frontend/yaml/compiler/compiler.go
@ -3,9 +3,9 @@ package compiler
 import (
 	"fmt"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
 )

 // TODO(bradrydzewski) compiler should handle user-defined volumes from YAML
--- a/cncd/pipeline/pipeline/frontend/yaml/compiler/convert.go
+++ b/cncd/pipeline/pipeline/frontend/yaml/compiler/convert.go
@ -5,8 +5,8 @@ import (
 	"path"
 	"strings"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
 )

 func (c *Compiler) createProcess(name string, container *yaml.Container, section string) *backend.Step {
--- a/cncd/pipeline/pipeline/frontend/yaml/compiler/option.go
+++ b/cncd/pipeline/pipeline/frontend/yaml/compiler/option.go
@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
 )

 // Option configures a compiler option.
--- a/cncd/pipeline/pipeline/frontend/yaml/compiler/option_test.go
+++ b/cncd/pipeline/pipeline/frontend/yaml/compiler/option_test.go
@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
 )

 func TestWithWorkspace(t *testing.T) {
--- a/cncd/pipeline/pipeline/frontend/yaml/constraint.go
+++ b/cncd/pipeline/pipeline/frontend/yaml/constraint.go
@ -5,8 +5,8 @@ import (
 	"path/filepath"

 	libcompose "github.com/docker/libcompose/yaml"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/types"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/types"
 	"gopkg.in/yaml.v3"
 )

--- a/cncd/pipeline/pipeline/frontend/yaml/constraint_test.go
+++ b/cncd/pipeline/pipeline/frontend/yaml/constraint_test.go
@ -3,7 +3,7 @@ package yaml
 import (
 	"testing"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"

 	"gopkg.in/yaml.v3"
 )
--- a/cncd/pipeline/pipeline/frontend/yaml/linter/linter.go
+++ b/cncd/pipeline/pipeline/frontend/yaml/linter/linter.go
@ -3,7 +3,7 @@ package linter
 import (
 	"fmt"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
 )

 const (
--- a/cncd/pipeline/pipeline/frontend/yaml/linter/linter_test.go
+++ b/cncd/pipeline/pipeline/frontend/yaml/linter/linter_test.go
@ -3,7 +3,7 @@ package linter
 import (
 	"testing"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
 )

 func TestLint(t *testing.T) {
--- a/cncd/pipeline/pipeline/logger.go
+++ b/cncd/pipeline/pipeline/logger.go
@ -1,8 +1,8 @@
 package pipeline

 import (
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/multipart"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart"
 )

 // Logger handles the process logging.
--- a/cncd/pipeline/pipeline/option.go
+++ b/cncd/pipeline/pipeline/option.go
@ -3,7 +3,7 @@ package pipeline
 import (
 	"context"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
 )

 // Option configures a runtime option.
--- a/cncd/pipeline/pipeline/parse.go
+++ b/cncd/pipeline/pipeline/parse.go
@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
 )

 // Parse parses the pipeline config from an io.Reader.
--- a/cncd/pipeline/pipeline/pipeline.go
+++ b/cncd/pipeline/pipeline/pipeline.go
@ -6,8 +6,8 @@ import (

 	"golang.org/x/sync/errgroup"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/multipart"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart"
 )

 type (
--- a/cncd/pipeline/pipeline/rpc/client_grpc.go
+++ b/cncd/pipeline/pipeline/rpc/client_grpc.go
@ -6,8 +6,8 @@ import (
 	"log"
 	"time"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/rpc/proto"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc/proto"

 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
--- a/cncd/pipeline/pipeline/rpc/client_grpc_health.go
+++ b/cncd/pipeline/pipeline/rpc/client_grpc_health.go
@ -5,8 +5,8 @@ import (
 	// "encoding/json"
 	"time"

-	// "github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/rpc/proto"
+	// "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc/proto"

 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
--- a/cncd/pipeline/pipeline/rpc/peer.go
+++ b/cncd/pipeline/pipeline/rpc/peer.go
@ -3,7 +3,7 @@ package rpc
 import (
 	"context"

-	"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
 )

 // ErrCancelled signals the pipeine is cancelled.
--- a/cncd/pipeline/samples/sample_7_redis/pipeline.json
+++ b/cncd/pipeline/samples/sample_7_redis/pipeline.json
@ -23,7 +23,7 @@
            "DRONE_WORKSPACE": "/go/src/github.com/drone/envsubst"
          },
          "volumes": [
-            "/Users/bradrydzewski/code/src/github.com/laszlocph/woodpecker/cncd/pipeline/samples/sample_7_redis:/go/src/github.com/drone/envsubst"
+            "/Users/bradrydzewski/code/src/github.com/woodpecker-ci/woodpecker/cncd/pipeline/samples/sample_7_redis:/go/src/github.com/drone/envsubst"
          ],
          "networks": [
            {
@ -55,7 +55,7 @@
            "DRONE_WORKSPACE": "/go/src/github.com/drone/envsubst"
          },
          "volumes": [
-            "/Users/bradrydzewski/code/src/github.com/laszlocph/woodpecker/cncd/pipeline/samples/sample_7_redis:/go/src/github.com/drone/envsubst"
+            "/Users/bradrydzewski/code/src/github.com/woodpecker-ci/woodpecker/cncd/pipeline/samples/sample_7_redis:/go/src/github.com/drone/envsubst"
          ],
          "networks": [
            {
@ -103,7 +103,7 @@
            "echo $CI_SCRIPT | base64 -d | /bin/sh -e"
          ],
          "volumes": [
-            "/Users/bradrydzewski/code/src/github.com/laszlocph/woodpecker/cncd/pipeline/samples/sample_7_redis:/go/src/github.com/drone/envsubst"
+            "/Users/bradrydzewski/code/src/github.com/woodpecker-ci/woodpecker/cncd/pipeline/samples/sample_7_redis:/go/src/github.com/drone/envsubst"
          ],
          "networks": [
            {
--- a/cncd/pubsub/README
+++ b/cncd/pubsub/README
@ -2,5 +2,5 @@ Go package provides a common interface for publish-subscriber messaging.

 Documentation:

-    http://godoc.org/github.com/laszlocph/woodpecker/cncd/pubsub
-    http://godoc.org/github.com/laszlocph/woodpecker/cncd/pubsub/gcp
+    http://godoc.org/github.com/woodpecker-ci/woodpecker/cncd/pubsub
+    http://godoc.org/github.com/woodpecker-ci/woodpecker/cncd/pubsub/gcp
--- a/cncd/queue/README
+++ b/cncd/queue/README
@ -2,5 +2,5 @@ Go package provides a common interface for working with task queues.

 Documentation:

-    http://godoc.org/github.com/laszlocph/woodpecker/cncd/queue
-    http://godoc.org/github.com/laszlocph/woodpecker/cncd/queue/gcp
+    http://godoc.org/github.com/woodpecker-ci/woodpecker/cncd/queue
+    http://godoc.org/github.com/woodpecker-ci/woodpecker/cncd/queue/gcp
--- a/cncd/queue/fifo.go
+++ b/cncd/queue/fifo.go
@ -356,8 +356,8 @@ func (q *fifo) updateDepStatusInQueue(taskID string, status string) {
 		}
 	}

-	var n *list.Element
-	for e := q.waitingOnDeps.Front(); e != nil; e = n {
+	next = nil
+	for e := q.waitingOnDeps.Front(); e != nil; e = next {
 		next = e.Next()
 		waiting, ok := e.Value.(*Task)
 		for _, dep := range waiting.Dependencies {
--- a/cncd/queue/fifo_test.go
+++ b/cncd/queue/fifo_test.go
@ -200,6 +200,145 @@ func TestFifoErrors(t *testing.T) {
 	}
 }

+func TestFifoErrors2(t *testing.T) {
+	task1 := &Task{
+		ID: "1",
+	}
+
+	task2 := &Task{
+		ID:           "2",
+	}
+
+	task3 := &Task{
+		ID:           "3",
+		Dependencies: []string{"1", "2"},
+		DepStatus:    make(map[string]string),
+	}
+
+	q := New().(*fifo)
+	q.PushAtOnce(noContext, []*Task{task2, task3, task1})
+
+	for i := 0; i < 2; i++ {
+		got, _ := q.Poll(noContext, func(*Task) bool { return true })
+		if got != task1 && got != task2{
+			t.Errorf("expect task1 or task2 returned from queue as task3 depends on them")
+			return
+		}
+
+		if got != task1 {
+			q.Done(noContext, got.ID, StatusSuccess)
+		}
+		if got != task2 {
+			q.Error(noContext, got.ID, fmt.Errorf("exitcode 1, there was an error"))
+		}
+	}
+
+	got, _ := q.Poll(noContext, func(*Task) bool { return true })
+	if got != task3 {
+		t.Errorf("expect task3 returned from queue")
+		return
+	}
+
+	if got.ShouldRun() {
+		t.Errorf("expect task3 should not run, task1 succeeded but task2 failed")
+		return
+	}
+}
+
+func TestFifoErrorsMultiThread(t *testing.T) {
+	//logrus.SetLevel(logrus.DebugLevel)
+	task1 := &Task{
+		ID: "1",
+	}
+
+	task2 := &Task{
+		ID:           "2",
+		Dependencies: []string{"1"},
+		DepStatus:    make(map[string]string),
+	}
+
+	task3 := &Task{
+		ID:           "3",
+		Dependencies: []string{"1", "2"},
+		DepStatus:    make(map[string]string),
+	}
+
+	q := New().(*fifo)
+	q.PushAtOnce(noContext, []*Task{task2, task3, task1})
+
+	obtainedWorkCh := make(chan *Task)
+
+	for i := 0; i < 10; i++ {
+		go func(i int) {
+			for {
+				fmt.Printf("Worker %d started\n", i)
+				got, _ := q.Poll(noContext, func(*Task) bool { return true })
+				obtainedWorkCh <- got
+			}
+		}(i)
+	}
+
+	task1Processed := false
+	task2Processed := false
+
+	for {
+		select {
+		case got := <-obtainedWorkCh:
+			fmt.Println(got.ID)
+
+			if !task1Processed {
+				if got != task1 {
+					t.Errorf("expect task1 returned from queue as task2 and task3 depends on it")
+					return
+				} else {
+					task1Processed = true
+					q.Error(noContext, got.ID, fmt.Errorf("exitcode 1, there was an error"))
+					go func() {
+						for {
+							fmt.Printf("Worker spawned\n")
+							got, _ := q.Poll(noContext, func(*Task) bool { return true })
+							obtainedWorkCh <- got
+						}
+					}()
+				}
+			} else if !task2Processed {
+				if got != task2 {
+					t.Errorf("expect task2 returned from queue")
+					return
+				} else {
+					task2Processed = true
+					q.Done(noContext, got.ID, StatusSuccess)
+					go func() {
+						for {
+							fmt.Printf("Worker spawned\n")
+							got, _ := q.Poll(noContext, func(*Task) bool { return true })
+							obtainedWorkCh <- got
+						}
+					}()
+				}
+			} else {
+				if got != task3 {
+					t.Errorf("expect task3 returned from queue")
+					return
+				}
+
+				if got.ShouldRun() {
+					t.Errorf("expect task3 should not run, task1 succeeded but task2 failed")
+					return
+				} else {
+					return
+				}
+			}
+
+		case <-time.After(5 * time.Second):
+			info := q.Info(noContext)
+			fmt.Println(info.String())
+			t.Errorf("test timed out")
+			return
+		}
+	}
+}
+
 func TestFifoTransitiveErrors(t *testing.T) {
 	task1 := &Task{
 		ID: "1",
--- a/cncd/queue/queue.go
+++ b/cncd/queue/queue.go
@ -3,6 +3,8 @@ package queue
 import (
 	"context"
 	"errors"
+	"fmt"
+	"strings"
 )

 var (
@ -61,6 +63,12 @@ func (t *Task) ShouldRun() bool {
 	return false
 }

+func (t *Task) String() string {
+	var sb strings.Builder
+	sb.WriteString(fmt.Sprintf("%s (%s) - %s", t.ID, t.Dependencies, t.DepStatus))
+	return sb.String()
+}
+
 func runsOnFailure(runsOn []string) bool {
 	for _, status := range runsOn {
 		if status == "failure" {
@ -98,6 +106,24 @@ type InfoT struct {
 	Paused bool
 }

+func (t *InfoT) String() string {
+	var sb strings.Builder
+
+	for _, task := range t.Pending {
+		sb.WriteString("\t" +  task.String())
+	}
+
+	for _, task := range t.Running {
+		sb.WriteString("\t" +  task.String())
+	}
+
+	for _, task := range t.WaitingOnDeps {
+		sb.WriteString("\t" +  task.String())
+	}
+
+	return sb.String()
+}
+
 // Filter filters tasks in the queue. If the Filter returns false,
 // the Task is skipped and not returned to the subscriber.
 type Filter func(*Task) bool
--- a/Show more
+++ b/Show more