Skip to content

Commit 8416c1e

Browse files
committed
move signing funcs to rely on external go-apk library
Signed-off-by: Avi Deitcher <[email protected]>
1 parent 167f132 commit 8416c1e

File tree

7 files changed

+6
-252
lines changed

7 files changed

+6
-252
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.20
55
require (
66
chainguard.dev/apko v0.7.4-0.20230427160853-4082ea6e082e
77
cloud.google.com/go/storage v1.30.1
8-
github.com/chainguard-dev/go-apk v0.0.0-20230430192230-e7b24699f6d3
8+
github.com/chainguard-dev/go-apk v0.0.0-20230501082831-d4a4a3b48750
99
github.com/chainguard-dev/yam v0.0.0-20230411155911-ba3a3357c32e
1010
github.com/docker/docker v23.0.4+incompatible
1111
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ github.com/bwesterb/go-ristretto v1.2.1/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7N
145145
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
146146
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
147147
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
148-
github.com/chainguard-dev/go-apk v0.0.0-20230430192230-e7b24699f6d3 h1:bW2HZoKsgalodBL4NPwr68zqtPyFHQ3PktHmR9TEqko=
149-
github.com/chainguard-dev/go-apk v0.0.0-20230430192230-e7b24699f6d3/go.mod h1:AAWHP+cZSBRe1AjQbfio64C66XxlOXAS08orCjF0zj8=
148+
github.com/chainguard-dev/go-apk v0.0.0-20230501082831-d4a4a3b48750 h1:l0s4EA2eGjn1VFK4k7yxZywPCr7yGXkRtxS3jwMWlO4=
149+
github.com/chainguard-dev/go-apk v0.0.0-20230501082831-d4a4a3b48750/go.mod h1:AAWHP+cZSBRe1AjQbfio64C66XxlOXAS08orCjF0zj8=
150150
github.com/chainguard-dev/yam v0.0.0-20230411155911-ba3a3357c32e h1:TlpfdSUjQkrq2yh+bySzoOmPKspeaxmOr1fmsNCfNXM=
151151
github.com/chainguard-dev/yam v0.0.0-20230411155911-ba3a3357c32e/go.mod h1:sfV9rXdvBVe0PDTLWzPh4IpapowZ9CDROjMUN2etRrk=
152152
github.com/chrismellard/docker-credential-acr-env v0.0.0-20221129204813-6a4d6ed5d396 h1:ZUOndrE3hI7kIqsIAxtMLEmgakCLWodkiBxqoAN1QSQ=

internal/sign/rsa.go

-103
This file was deleted.

internal/sign/sign.go

-142
This file was deleted.

pkg/build/package.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"text/template"
3333

3434
"chainguard.dev/apko/pkg/log"
35-
"chainguard.dev/melange/internal/sign"
35+
sign "github.com/chainguard-dev/go-apk/pkg/signature"
3636
"github.com/chainguard-dev/go-apk/pkg/tarball"
3737
"github.com/psanford/memfs"
3838
)

pkg/cli/sign.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package cli
1717
import (
1818
"context"
1919

20-
"chainguard.dev/melange/internal/sign"
20+
sign "github.com/chainguard-dev/go-apk/pkg/signature"
2121
"github.com/spf13/cobra"
2222
)
2323

pkg/index/index.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ import (
2323
"sync"
2424

2525
apko_log "chainguard.dev/apko/pkg/log"
26+
sign "github.com/chainguard-dev/go-apk/pkg/signature"
2627
"github.com/korovkin/limiter"
2728
"github.com/sirupsen/logrus"
2829
apkrepo "gitlab.alpinelinux.org/alpine/go/repository"
29-
30-
"chainguard.dev/melange/internal/sign"
3130
)
3231

3332
type Context struct {

0 commit comments

Comments
 (0)