Skip to content

Commit 7383119

Browse files
authored
Merge pull request #408 from kzys/debian10
Use Debian 10 (buster) on quickstart.md and as Docker images' variants
2 parents 96a454b + bc5c6e0 commit 7383119

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

.buildkite/al2_pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ steps:
2424
FICD_DM_VOLUME_GROUP: "fcci-vg"
2525
command:
2626
- ./.buildkite/setup_al2.sh
27-
- docker run --rm -v $PWD:/mnt debian:stretch-slim rm -rf /mnt/tools/image-builder/rootfs
27+
- docker run --rm -v $PWD:/mnt debian:buster-slim rm -rf /mnt/tools/image-builder/rootfs
2828

2929
- wait
3030

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ steps:
2323
EXTRAGOARGS: "-race"
2424
command:
2525
- make test-images
26-
- docker run --rm -v $PWD:/mnt debian:stretch-slim rm -rf /mnt/tools/image-builder/rootfs
26+
- docker run --rm -v $PWD:/mnt debian:buster-slim rm -rf /mnt/tools/image-builder/rootfs
2727
- sudo install -d -o root -g buildkite-agent -m 775 "/local/artifacts/$BUILDKITE_BUILD_NUMBER"
2828
- cp tools/image-builder/rootfs.img "/local/artifacts/$BUILDKITE_BUILD_NUMBER/"
2929

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SUBMODULES=_submodules
2828
UID:=$(shell id -u)
2929
GID:=$(shell id -g)
3030

31-
FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.13-stretch
31+
FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.13-buster
3232
export FIRECRACKER_CONTAINERD_TEST_IMAGE?=localhost/firecracker-containerd-test
3333
export GO_CACHE_VOLUME_NAME?=gocache
3434

docs/quickstart.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ files into `/usr/local/bin`.
1515
1. Get an AWS account (see
1616
[this article](https://aws.amazon.com/premiumsupport/knowledge-center/create-and-activate-aws-account/)
1717
if you need help creating one)
18-
2. Launch an i3.metal instance running Debian Stretch (you can find it in the
19-
[AWS marketplace](http://deb.li/awsmp) or on [this
20-
page](https://wiki.debian.org/Cloud/AmazonEC2Image/Stretch). If you need
21-
help launching an EC2 instance, see the
18+
2. Launch an i3.metal instance running Debian Buster (you can find it in the
19+
[AWS marketplace](https://aws.amazon.com/marketplace/pp/B0859NK4HC) or
20+
on [this page](https://wiki.debian.org/Cloud/AmazonEC2Image/Buster).
21+
If you need help launching an EC2 instance, see the
2222
[EC2 getting started guide](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EC2_GetStarted.html).
2323
3. Run the script below to download and install all the required components.
2424
This script expects to be run from your `$HOME` directory.
@@ -30,19 +30,17 @@ cd ~
3030

3131
# Install git, Go 1.11, make, curl
3232
sudo mkdir -p /etc/apt/sources.list.d
33-
echo "deb http://ftp.debian.org/debian stretch-backports main" | \
34-
sudo tee /etc/apt/sources.list.d/stretch-backports.list
3533
sudo DEBIAN_FRONTEND=noninteractive apt-get update
3634
sudo DEBIAN_FRONTEND=noninteractive apt-get \
37-
--target-release stretch-backports \
3835
install --yes \
3936
golang-go \
4037
make \
4138
git \
4239
curl \
4340
e2fsprogs \
4441
util-linux \
45-
bc
42+
bc \
43+
gnupg
4644

4745
cd ~
4846

0 commit comments

Comments
 (0)