From 8a11deed0176d2e233e3e6954890269d3603263a Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 1 Sep 2023 09:14:29 +0200 Subject: [PATCH 1/4] update build --- .woodpecker.yml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 1507722..9b466e7 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,7 +1,7 @@ variables: - &golang "golang:1.19" - &volumes - - /var/www/html/artifacts/capture/deblan:/artifacts + - /var/www/html/artifacts/deblan/capture:/artifacts pipeline: test: diff --git a/Dockerfile b/Dockerfile index 2ba558f..3cf6690 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19 as builder +FROM golang:1.21-bullseye as builder WORKDIR /src COPY go.mod go.sum ./ @@ -7,7 +7,7 @@ RUN go mod download COPY . . RUN BUILD_DIR=/app make -FROM debian:stable-slim +FROM debian:bullseye-slim RUN apt-get update && apt-get install -y ca-certificates COPY --from=builder /app/capture-linux-amd64 /usr/bin/capture From 09cd37aa3bd743f6dd48a09685b49fbc48a1c0c4 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 1 Sep 2023 09:26:55 +0200 Subject: [PATCH 2/4] update ci --- .woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 9b466e7..ccdc987 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -14,6 +14,7 @@ pipeline: volumes: *volumes commands: - make + - cp build/* /artifacts push_release: image: plugins/gitea-release From ee1bc68760231512cc87254764f894c917beacce Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 29 Sep 2023 15:55:50 +0200 Subject: [PATCH 3/4] update readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 909d932..d6902b1 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,9 @@ docker run -p 9000:9000 -p 9001:9001 deblan/capture -url=https://example.com/ -p #### Settings -| param | description | -| -------------- | ------------- | -| `-url` | **Required.** Set the url you want to proxy | +| param | description | +| -------------- | ------------- | +| `-url` | **Required.** Set the url you want to proxy | | `-port` | Set the proxy port. Default: *9000* | | `-dashboard` | Set the dashboard port. Default: *9001* | | `-captures` | Set how many captures to show in the dashboard. Default: *16* | From 1f089236dc0c5a8315be1e65bf192601d964735c Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 29 Sep 2023 15:55:59 +0200 Subject: [PATCH 4/4] fix ci syntax --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ccdc987..6dc3c8d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,7 +3,7 @@ variables: - &volumes - /var/www/html/artifacts/deblan/capture:/artifacts -pipeline: +steps: test: image: *golang commands: