Skip to content

Commit e913850

Browse files
committed
Use alpine 3.11 everywhere. Increase buildkit cache buffer to 1GB.
1 parent 667cbe0 commit e913850

File tree

14 files changed

+17
-17
lines changed

14 files changed

+17
-17
lines changed

build.earth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13-alpine3.10
1+
FROM golang:1.13-alpine3.11
22

33
RUN apk add --update --no-cache \
44
openssl \

buildkitd/entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ if [ -z "$EARTHLY_TMP_DIR" ]; then
1414
fi
1515

1616
BUILDKIT_ROOT_DIR="$EARTHLY_TMP_DIR"/buildkit
17-
# Leave 500MB as additional buffer.
18-
buildkit_cache_size_mb=$(( CACHE_SIZE_MB - 500 ))
17+
# Leave 1GB as additional buffer.
18+
buildkit_cache_size_mb=$(( CACHE_SIZE_MB - 1000 ))
1919
sed 's^:BUILDKIT_ROOT_DIR:^'"$BUILDKIT_ROOT_DIR"'^g; s/:CACHE_SIZE_MB:/'"$buildkit_cache_size_mb"'/g' \
2020
/etc/buildkitd.toml.template > /etc/buildkitd.toml
2121

docs/01-basics/basics.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ target:
8787
For example, here is an earthfile of an example go app:
8888

8989
```earth
90-
FROM golang:1.13-alpine3.10
90+
FROM golang:1.13-alpine3.11
9191
WORKDIR /go-example
9292
9393
build:
@@ -130,8 +130,8 @@ Finally, notice how the output of the build: the docker image `go-example:latest
130130
Going back to the example earthfile definition, here is what each command does:
131131

132132
```earth
133-
# The build starts from a docker image: golang:1.13-alpine3.10
134-
FROM golang:1.13-alpine3.10
133+
# The build starts from a docker image: golang:1.13-alpine3.11
134+
FROM golang:1.13-alpine3.11
135135
# We change the current working directory.
136136
WORKDIR /go-example
137137

earthfile2llb/parser/build.earth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13-alpine3.10
1+
FROM golang:1.13-alpine3.11
22

33
RUN apk add --update --no-cache \
44
openjdk11 \

examples/go/build.earth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13-alpine3.10
1+
FROM golang:1.13-alpine3.11
22

33
WORKDIR /go-example
44

examples/tests/build-arg.earth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.10
1+
FROM alpine:3.11
22
WORKDIR /test
33
file-exists:
44
ARG VAR1=nope.txt

examples/tests/builtin-args.earth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.10
1+
FROM alpine:3.11
22
builtin-args-test:
33
ARG EARTHLY_TARGET
44
ARG EARTHLY_TARGET_PROJECT

examples/tests/cache1.earth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.10
1+
FROM alpine:3.11
22
test:
33
RUN mkdir -p /cache-test
44
RUN --mount=type=cache,target=/cache-test echo "HELLO" > /cache-test/test.txt

examples/tests/cache2.earth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM alpine:3.10
1+
FROM alpine:3.11
22
test:
33
RUN --mount=type=cache,target=/cache-test test -f /cache-test/test.txt

examples/tests/excludes.earth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.10
1+
FROM alpine:3.11
22
test:
33
WORKDIR /test
44
COPY . .

examples/tests/privileged.earth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.10
1+
FROM alpine:3.11
22
test:
33
RUN cat /proc/self/status | grep CapEff | grep 00000000a80425fb
44
RUN --privileged cat /proc/self/status | grep CapEff | grep 0000003fffffffff

examples/tests/secrets.earth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.10
1+
FROM alpine:3.11
22
test:
33
WORKDIR /test
44
RUN --secret=SECRET1=+secrets/SECRET1 test "$SECRET1" == "foo"

examples/tests/star.earth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.10
1+
FROM alpine:3.11
22
WORKDIR /test
33
test:
44
COPY *.txt ./

llbutil/fakedep.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/moby/buildkit/client/llb"
55
)
66

7-
const fakeDepImg = "alpine:3.10"
7+
const fakeDepImg = "alpine:3.11"
88

99
// WithDependency creates a fake dependency between two states.
1010
func WithDependency(state llb.State, depState llb.State, opts ...llb.RunOption) llb.State {

0 commit comments

Comments
 (0)