Skip to content

Commit 59c506c

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request #20 from AkihiroSuda/dev
update dependencies (nix 2.17.0)
2 parents cbf79cc + 3961d2b commit 59c506c

File tree

6 files changed

+172
-993
lines changed

6 files changed

+172
-993
lines changed

‎.github/workflows/ghcr.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ jobs:
1717
runs-on: ubuntu-22.04
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
- name: Docker meta
2222
id: meta
23-
uses: docker/metadata-action@v4.0.1
23+
uses: docker/metadata-action@v5.0.0
2424
with:
2525
images: ghcr.io/${{ github.repository }}
2626
- name: Set up Docker Buildx
27-
uses: docker/setup-buildx-action@v2.0.0
27+
uses: docker/setup-buildx-action@v3.0.0
2828
- name: Login to GHCR
2929
if: github.event_name != 'pull_request'
30-
uses: docker/login-action@v2.0.0
30+
uses: docker/login-action@v3.0.0
3131
with:
3232
registry: ghcr.io
3333
username: ${{ github.repository_owner }}
3434
password: ${{ secrets.GITHUB_TOKEN }}
3535
- name: Build and push
36-
uses: docker/build-push-action@v3.1.1
36+
uses: docker/build-push-action@v5.0.0
3737
with:
3838
context: .
3939
file: ./bootstrap.Dockerfile

‎.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ jobs:
1212
runs-on: ubuntu-22.04
1313
timeout-minutes: 20
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 1
1818
- name: golangci-lint
19-
uses: golangci/golangci-lint-action@v3.2.0
19+
uses: golangci/golangci-lint-action@v3.7.0
2020
with:
21-
version: v1.50
22-
args: --verbose
21+
version: v1.54.2
22+
args: --verbose --timeout=10m
2323

2424
test-integration:
2525
runs-on: ubuntu-22.04
2626
timeout-minutes: 30
2727
steps:
28-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2929
with:
3030
fetch-depth: 1
3131
- name: "Install test dependencies"

‎bootstrap.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG GOLANG_IMAGE=golang:1.19.2-alpine@sha256:9d3bd0937054ed71c04839c909aec4736b1a83a96010826cfeed4abed12acf59
2-
ARG NIX_IMAGE=nixos/nix:2.11.1@sha256:d8c6b97091d6944dd773c3c239899af047077dbf5411ef229bb50e5b21404b0d
1+
ARG GOLANG_IMAGE=golang:1.21.1-alpine@sha256:96634e55b363cb93d39f78fb18aa64abc7f96d372c176660d7b8b6118939d97b
2+
ARG NIX_IMAGE=nixos/nix:2.17.0@sha256:a186d0501304e87751280b7b6ad62b54b9d08b8c5c63b9752eac408e1159c340
33

44
FROM --platform=${BUILDPLATFORM} ${GOLANG_IMAGE} AS build
55
WORKDIR /src

‎cmd/buildkit-nix/frontend.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main
22

33
import (
4-
"bytes"
54
"context"
65
"fmt"
76
"os"
@@ -10,7 +9,8 @@ import (
109
"github.com/docker/distribution/reference"
1110
"github.com/moby/buildkit/client/llb"
1211
"github.com/moby/buildkit/exporter/containerimage/exptypes"
13-
"github.com/moby/buildkit/frontend/dockerfile/dockerfile2llb"
12+
"github.com/moby/buildkit/frontend/dockerfile/parser"
13+
"github.com/moby/buildkit/frontend/dockerui"
1414
"github.com/moby/buildkit/frontend/gateway/client"
1515
"github.com/moby/buildkit/frontend/gateway/grpcclient"
1616
"github.com/moby/buildkit/util/appcontext"
@@ -46,15 +46,15 @@ func frontendAction(cmd *cobra.Command, args []string) error {
4646

4747
func frontendBuild(nixImage string) client.BuildFunc {
4848
return func(ctx context.Context, c client.Client) (*client.Result, error) {
49-
nixImageSt := llb.Image(nixImage, llb.WithMetaResolver(c), dockerfile2llb.WithInternalName("nix image"))
49+
nixImageSt := llb.Image(nixImage, llb.WithMetaResolver(c), dockerui.WithInternalName("nix image"))
5050

5151
dfName := c.BuildOpts().Opts[keyFilename]
5252
if dfName == "" {
5353
return nil, fmt.Errorf("option %q was not specified?", keyFilename)
5454
}
5555
localDfSt := llb.Local(localNameDockerfile,
5656
llb.SessionID(c.BuildOpts().SessionID),
57-
dockerfile2llb.WithInternalName("local dockerfile"),
57+
dockerui.WithInternalName("local dockerfile"),
5858
)
5959

6060
// Inject the self binary into the ExecOp.
@@ -70,7 +70,7 @@ func frontendBuild(nixImage string) client.BuildFunc {
7070

7171
localCtxSt := llb.Local(localNameContext,
7272
llb.SessionID(c.BuildOpts().SessionID),
73-
dockerfile2llb.WithInternalName("local context"),
73+
dockerui.WithInternalName("local context"),
7474
)
7575

7676
runSt := nixImageSt.Run(
@@ -124,11 +124,11 @@ func getSelfImageSt(ctx context.Context, c client.Client, localDfSt llb.State, d
124124
if err != nil {
125125
return nil, "", err
126126
}
127-
selfImageRefStr, _, _, ok := dockerfile2llb.DetectSyntax(bytes.NewReader(dfBytes))
127+
selfImageRefStr, _, _, ok := parser.DetectSyntax(dfBytes)
128128
if !ok {
129129
return nil, "", fmt.Errorf("failed to detect self image reference from %q", dfName)
130130
}
131-
if selfImageDgst, _, err := c.ResolveImageConfig(ctx, selfImageRefStr, llb.ResolveImageConfigOpt{}); err != nil {
131+
if _, selfImageDgst, _, err := c.ResolveImageConfig(ctx, selfImageRefStr, llb.ResolveImageConfigOpt{}); err != nil {
132132
return nil, "", err
133133
} else if selfImageDgst != "" {
134134
selfImageRef, err := reference.ParseNormalizedNamed(selfImageRefStr)
@@ -141,7 +141,7 @@ func getSelfImageSt(ctx context.Context, c client.Client, localDfSt llb.State, d
141141
}
142142
selfImageRefStr = selfImageRefWithDigest.String()
143143
}
144-
selfImageSt := llb.Image(selfImageRefStr, llb.WithMetaResolver(c), dockerfile2llb.WithInternalName("self image"))
144+
selfImageSt := llb.Image(selfImageRefStr, llb.WithMetaResolver(c), dockerui.WithInternalName("self image"))
145145
return &selfImageSt, selfImageRefStr, nil
146146
}
147147

‎go.mod

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,60 @@
11
module github.com/reproducible-containers/buildkit-nix
22

3-
go 1.19
3+
go 1.20
44

55
require (
6-
github.com/containerd/containerd v1.6.8
7-
github.com/cyphar/filepath-securejoin v0.2.2
8-
github.com/docker/distribution v2.8.1+incompatible
9-
github.com/moby/buildkit v0.10.4
6+
github.com/containerd/containerd v1.7.6
7+
github.com/cyphar/filepath-securejoin v0.2.4
8+
github.com/docker/distribution v2.8.2+incompatible
9+
github.com/moby/buildkit v0.12.2
1010
github.com/opencontainers/go-digest v1.0.0
11-
github.com/sirupsen/logrus v1.9.0
12-
github.com/spf13/cobra v1.0.0
11+
github.com/sirupsen/logrus v1.9.3
12+
github.com/spf13/cobra v1.7.0
1313
)
1414

1515
require (
16-
github.com/Microsoft/go-winio v0.5.1 // indirect
17-
github.com/Microsoft/hcsshim v0.9.4 // indirect
18-
github.com/agext/levenshtein v1.2.3 // indirect
19-
github.com/containerd/cgroups v1.0.3 // indirect
20-
github.com/containerd/continuity v0.2.3-0.20220330195504-d132b287edc8 // indirect
21-
github.com/containerd/ttrpc v1.1.0 // indirect
22-
github.com/containerd/typeurl v1.0.2 // indirect
23-
github.com/docker/docker v20.10.7+incompatible // indirect
24-
github.com/docker/go-connections v0.4.0 // indirect
25-
github.com/docker/go-units v0.4.0 // indirect
16+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
17+
github.com/Microsoft/go-winio v0.6.1 // indirect
18+
github.com/Microsoft/hcsshim v0.11.0 // indirect
19+
github.com/containerd/cgroups v1.1.0 // indirect
20+
github.com/containerd/continuity v0.4.2 // indirect
21+
github.com/containerd/ttrpc v1.2.2 // indirect
22+
github.com/containerd/typeurl/v2 v2.1.1 // indirect
23+
github.com/docker/docker v24.0.0-rc.2.0.20230718135204-8e51b8b59cb8+incompatible // indirect
24+
github.com/docker/go-units v0.5.0 // indirect
25+
github.com/go-logr/logr v1.2.3 // indirect
26+
github.com/go-logr/stdr v1.2.2 // indirect
2627
github.com/gogo/googleapis v1.4.1 // indirect
2728
github.com/gogo/protobuf v1.3.2 // indirect
2829
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
29-
github.com/golang/protobuf v1.5.2 // indirect
30+
github.com/golang/protobuf v1.5.3 // indirect
3031
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
31-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
32-
github.com/klauspost/compress v1.15.1 // indirect
32+
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
33+
github.com/in-toto/in-toto-golang v0.5.0 // indirect
34+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
35+
github.com/klauspost/compress v1.16.3 // indirect
3336
github.com/moby/locker v1.0.1 // indirect
34-
github.com/moby/sys/signal v0.6.0 // indirect
35-
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
37+
github.com/moby/sys/sequential v0.5.0 // indirect
38+
github.com/moby/sys/signal v0.7.0 // indirect
39+
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
3640
github.com/pkg/errors v0.9.1 // indirect
41+
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
42+
github.com/shibumi/go-pathspec v1.3.0 // indirect
3743
github.com/spf13/pflag v1.0.5 // indirect
38-
github.com/tonistiigi/fsutil v0.0.0-20220115021204-b19f7f9cb274 // indirect
39-
go.opencensus.io v0.23.0 // indirect
40-
go.opentelemetry.io/otel v1.4.1 // indirect
41-
go.opentelemetry.io/otel/trace v1.4.1 // indirect
42-
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
43-
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
44-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
45-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
46-
golang.org/x/text v0.3.7 // indirect
47-
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
48-
google.golang.org/grpc v1.45.0 // indirect
49-
google.golang.org/protobuf v1.27.1 // indirect
44+
github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb // indirect
45+
go.opencensus.io v0.24.0 // indirect
46+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
47+
go.opentelemetry.io/otel v1.14.0 // indirect
48+
go.opentelemetry.io/otel/metric v0.37.0 // indirect
49+
go.opentelemetry.io/otel/trace v1.14.0 // indirect
50+
golang.org/x/crypto v0.2.0 // indirect
51+
golang.org/x/mod v0.9.0 // indirect
52+
golang.org/x/net v0.8.0 // indirect
53+
golang.org/x/sync v0.1.0 // indirect
54+
golang.org/x/sys v0.7.0 // indirect
55+
golang.org/x/text v0.8.0 // indirect
56+
golang.org/x/tools v0.7.0 // indirect
57+
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
58+
google.golang.org/grpc v1.53.0 // indirect
59+
google.golang.org/protobuf v1.30.0 // indirect
5060
)
51-
52-
// from https://github.com/moby/buildkit/blob/v0.10.4/go.mod#L124
53-
replace github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220414164044-61404de7df1a+incompatible

0 commit comments

Comments
 (0)