Skip to content

Commit b342022

Browse files
committed
Don't just replace compress
This is causing issues so I just rewrote all the module paths to be relative to this repo. Signed-off-by: Jon Johnson <jon.johnson@chainguard.dev>
1 parent 6d22814 commit b342022

38 files changed

Lines changed: 50 additions & 54 deletions

go.mod

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ require (
1313
github.com/fxamacker/cbor/v2 v2.7.0
1414
github.com/google/go-cmp v0.7.0
1515
github.com/google/go-containerregistry v0.20.2
16-
github.com/klauspost/compress v1.17.11
1716
github.com/minio/sha256-simd v1.0.1
1817
github.com/spf13/cobra v1.9.1
1918
golang.org/x/crypto v0.36.0
@@ -65,6 +64,7 @@ require (
6564
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
6665
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6766
github.com/kelseyhightower/envconfig v1.4.0 // indirect
67+
github.com/klauspost/compress v1.17.11 // indirect
6868
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
6969
github.com/mitchellh/go-homedir v1.1.0 // indirect
7070
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -104,7 +104,4 @@ require (
104104
gopkg.in/ini.v1 v1.67.0 // indirect
105105
)
106106

107-
replace (
108-
github.com/google/go-containerregistry => ./pkg/forks/github.com/google/go-containerregistry
109-
github.com/klauspost/compress => ./pkg/forks/github.com/klauspost/compress
110-
)
107+
replace github.com/google/go-containerregistry => ./pkg/forks/github.com/google/go-containerregistry

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dv
154154
github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
155155
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
156156
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
157+
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
158+
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
157159
github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU=
158160
github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
159161
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=

internal/apk/apk.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
httpserve "github.com/jonjohnsonjr/dagdotdev/internal/forks/http"
3838
"github.com/jonjohnsonjr/dagdotdev/internal/soci"
3939
"github.com/jonjohnsonjr/dagdotdev/internal/xxd"
40-
"github.com/klauspost/compress/gzhttp"
40+
"github.com/jonjohnsonjr/dagdotdev/pkg/forks/github.com/klauspost/compress/gzhttp"
4141
)
4242

4343
// We should not buffer blobs greater than 2MB

internal/explore/explore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"github.com/jonjohnsonjr/dagdotdev/internal/gguf"
3939
"github.com/jonjohnsonjr/dagdotdev/internal/soci"
4040
"github.com/jonjohnsonjr/dagdotdev/internal/xxd"
41-
"github.com/klauspost/compress/gzhttp"
41+
"github.com/jonjohnsonjr/dagdotdev/pkg/forks/github.com/klauspost/compress/gzhttp"
4242
"golang.org/x/oauth2"
4343
"golang.org/x/sync/errgroup"
4444
)

internal/explore/soci.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/google/go-containerregistry/pkg/v1/types"
1717
httpserve "github.com/jonjohnsonjr/dagdotdev/internal/forks/http"
1818
"github.com/jonjohnsonjr/dagdotdev/internal/soci"
19-
"github.com/klauspost/compress/zstd"
19+
"github.com/jonjohnsonjr/dagdotdev/pkg/forks/github.com/klauspost/compress/zstd"
2020
)
2121

2222
// 5 MB.

internal/forks/elf/elf.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"strings"
1818
"sync"
1919

20-
"github.com/klauspost/compress/zstd"
20+
"github.com/jonjohnsonjr/dagdotdev/pkg/forks/github.com/klauspost/compress/zstd"
2121
"golang.org/x/exp/slices"
2222
)
2323

internal/git/git.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/jonjohnsonjr/dagdotdev/internal/forks/rsc.io/gitfs"
2020
"golang.org/x/exp/maps"
2121

22-
"github.com/klauspost/compress/gzhttp"
22+
"github.com/jonjohnsonjr/dagdotdev/pkg/forks/github.com/klauspost/compress/gzhttp"
2323
)
2424

2525
// We should not buffer blobs greater than 2MB

internal/soci/indexer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"io"
1010

11-
"github.com/klauspost/compress/zstd"
11+
"github.com/jonjohnsonjr/dagdotdev/pkg/forks/github.com/klauspost/compress/zstd"
1212

1313
ogzip "compress/gzip"
1414

internal/soci/peek.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
ogzip "compress/gzip"
1111

12-
kzstd "github.com/klauspost/compress/zstd"
12+
kzstd "github.com/jonjohnsonjr/dagdotdev/pkg/forks/github.com/klauspost/compress/zstd"
1313

1414
"github.com/google/go-containerregistry/pkg/logs"
1515
"github.com/jonjohnsonjr/dagdotdev/internal/and"

internal/soci/tree.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/jonjohnsonjr/dagdotdev/internal/and"
1717
"github.com/jonjohnsonjr/dagdotdev/internal/forks/compress/flate"
1818
"github.com/jonjohnsonjr/dagdotdev/internal/forks/compress/gzip"
19-
"github.com/klauspost/compress/zstd"
19+
"github.com/jonjohnsonjr/dagdotdev/pkg/forks/github.com/klauspost/compress/zstd"
2020
)
2121

2222
type Index interface {

0 commit comments

Comments
 (0)