Merge branch 'develop'
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending

This commit is contained in:
Simon Vieille 2023-09-29 15:56:20 +02:00
commit 92aa6b341f
3 changed files with 8 additions and 7 deletions

View file

@ -1,9 +1,9 @@
variables: variables:
- &golang "golang:1.19" - &golang "golang:1.19"
- &volumes - &volumes
- /var/www/html/artifacts/capture/deblan:/artifacts - /var/www/html/artifacts/deblan/capture:/artifacts
pipeline: steps:
test: test:
image: *golang image: *golang
commands: commands:
@ -14,6 +14,7 @@ pipeline:
volumes: *volumes volumes: *volumes
commands: commands:
- make - make
- cp build/* /artifacts
push_release: push_release:
image: plugins/gitea-release image: plugins/gitea-release

View file

@ -1,4 +1,4 @@
FROM golang:1.19 as builder FROM golang:1.21-bullseye as builder
WORKDIR /src WORKDIR /src
COPY go.mod go.sum ./ COPY go.mod go.sum ./
@ -7,7 +7,7 @@ RUN go mod download
COPY . . COPY . .
RUN BUILD_DIR=/app make RUN BUILD_DIR=/app make
FROM debian:stable-slim FROM debian:bullseye-slim
RUN apt-get update && apt-get install -y ca-certificates RUN apt-get update && apt-get install -y ca-certificates
COPY --from=builder /app/capture-linux-amd64 /usr/bin/capture COPY --from=builder /app/capture-linux-amd64 /usr/bin/capture

View file

@ -19,9 +19,9 @@ docker run -p 9000:9000 -p 9001:9001 deblan/capture -url=https://example.com/ -p
#### Settings #### Settings
| param | description | | param | description |
| -------------- | ------------- | | -------------- | ------------- |
| `-url` | **Required.** Set the url you want to proxy | | `-url` | **Required.** Set the url you want to proxy |
| `-port` | Set the proxy port. Default: *9000* | | `-port` | Set the proxy port. Default: *9000* |
| `-dashboard` | Set the dashboard port. Default: *9001* | | `-dashboard` | Set the dashboard port. Default: *9001* |
| `-captures` | Set how many captures to show in the dashboard. Default: *16* | | `-captures` | Set how many captures to show in the dashboard. Default: *16* |