5 Commits
4.7.1 ... 4.7.2

Author SHA1 Message Date
Antoni Sawicki
b6e402029a ver bump to 4.7.2 2024-07-09 02:00:45 -07:00
Antoni Sawicki
9f7107c00b add docker clean target 2024-07-09 02:00:34 -07:00
Antoni Sawicki
500ad0d19a use local binaries for local dockerfile 2024-07-09 01:57:51 -07:00
Antoni Sawicki
b5747f52e7 use embedded certs 2024-07-09 01:57:03 -07:00
Antoni Sawicki
9f21d8d06e makefile fixes 2024-07-07 23:38:33 -07:00
5 changed files with 27 additions and 11 deletions

6
Dockerfile.local Normal file
View File

@@ -0,0 +1,6 @@
FROM chromedp/headless-shell
ARG TARGETARCH
ADD wrp-${TARGETARCH}-linux /wrp
ENTRYPOINT ["/wrp"]
ENV PATH="/headless-shell:${PATH}"
LABEL maintainer="as@tenoware.com"

View File

@@ -1,23 +1,28 @@
all: wrp
wrp: wrp.go
go build wrp.go
go build -a
cross:
GOOS=linux GOARCH=amd64 go build -a -o wrp-amd64-linux wrp.go
GOOS=freebsd GOARCH=amd64 go build -a -o wrp-amd64-freebsd wrp.go
GOOS=openbsd GOARCH=amd64 go build -a -o wrp-amd64-openbsd wrp.go
GOOS=darwin GOARCH=amd64 go build -a -o wrp-amd64-macos wrp.go
GOOS=darwin GOARCH=arm64 go build -a -o wrp-arm64-macos wrp.go
GOOS=windows GOARCH=amd64 go build -a -o wrp-amd64-windows.exe wrp.go
GOOS=linux GOARCH=arm go build -a -o wrp-arm-linux wrp.go
GOOS=linux GOARCH=arm64 go build -a -o wrp-arm64-linux wrp.go
GOOS=linux GOARCH=amd64 go build -a -o wrp-amd64-linux
GOOS=freebsd GOARCH=amd64 go build -a -o wrp-amd64-freebsd
GOOS=openbsd GOARCH=amd64 go build -a -o wrp-amd64-openbsd
GOOS=darwin GOARCH=amd64 go build -a -o wrp-amd64-macos
GOOS=darwin GOARCH=arm64 go build -a -o wrp-arm64-macos
GOOS=windows GOARCH=amd64 go build -a -o wrp-amd64-windows.exe
GOOS=linux GOARCH=arm go build -a -o wrp-arm-linux
GOOS=linux GOARCH=arm64 go build -a -o wrp-arm64-linux
docker-local:
docker buildx build --platform linux/amd64,linux/arm64 -t tenox7/wrp:latest --load .
GOOS=linux GOARCH=amd64 go build -a -o wrp-amd64-linux
GOOS=linux GOARCH=arm64 go build -a -o wrp-arm64-linux
docker buildx build --platform linux/amd64,linux/arm64 -t tenox7/wrp:latest -f Dockerfile.local --load .
docker-push:
docker buildx build --platform linux/amd64,linux/arm64 -t tenox7/wrp:latest --push .
docker-clean:
docker buildx prune -a -f
clean:
rm -rf wrp-* wrp

1
go.mod
View File

@@ -5,6 +5,7 @@ go 1.21.5
require (
github.com/JohannesKaufmann/html-to-markdown v1.6.0
github.com/MaxHalford/halfgone v0.0.0-20171017091812-482157b86ccb
github.com/breml/rootcerts v0.2.17
github.com/chromedp/cdproto v0.0.0-20240519224452-66462be74baa
github.com/chromedp/chromedp v0.9.5
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646

2
go.sum
View File

@@ -6,6 +6,8 @@ github.com/PuerkitoBio/goquery v1.9.2 h1:4/wZksC3KgkQw7SQgkKotmKljk0M6V8TUvA8Wb4
github.com/PuerkitoBio/goquery v1.9.2/go.mod h1:GHPCaP0ODyyxqcNoFGYlAprUFH81NuRPd0GX3Zu2Mvk=
github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
github.com/breml/rootcerts v0.2.17 h1:0/M2BE2Apw0qEJCXDOkaiu7d5Sx5ObNfe1BkImJ4u1I=
github.com/breml/rootcerts v0.2.17/go.mod h1:S/PKh+4d1HUn4HQovEB8hPJZO6pUZYrIhmXBhsegfXw=
github.com/chromedp/cdproto v0.0.0-20240202021202-6d0b6a386732/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
github.com/chromedp/cdproto v0.0.0-20240519224452-66462be74baa h1:T3Ho4BWIkoEoMPCj90W2HIPF/k56qk4JWzTs6JUBxVw=
github.com/chromedp/cdproto v0.0.0-20240519224452-66462be74baa/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=

4
wrp.go
View File

@@ -36,6 +36,7 @@ import (
"time"
"github.com/MaxHalford/halfgone"
_ "github.com/breml/rootcerts"
"github.com/chromedp/cdproto/css"
"github.com/chromedp/cdproto/emulation"
"github.com/chromedp/cdproto/input"
@@ -44,7 +45,7 @@ import (
"github.com/soniakeys/quant/median"
)
const version = "4.7.1"
const version = "4.7.2"
var (
addr = flag.String("l", ":8080", "Listen address:port, default :8080")
@@ -591,6 +592,7 @@ func main() {
log.SetFlags(log.LstdFlags | log.Lshortfile)
flag.Parse()
log.Printf("Web Rendering Proxy Version %s (%v)\n", version, runtime.GOARCH)
log.Printf("Using embedded ca-certs from github.com/breml/rootcerts")
log.Printf("Args: %q", os.Args)
if len(os.Getenv("PORT")) > 0 {
*addr = ":" + os.Getenv(("PORT"))