Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump all the things #30

Merged
merged 5 commits into from
Aug 10, 2020
Merged

Bump all the things #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc9238a
Update musl to 1.2.1
iliana Aug 7, 2020
3b20e3c
Update Rust to 1.45.2
iliana Aug 7, 2020
9cd5ff7
Update Go to 1.14.7
iliana Aug 7, 2020
50da544
license-scan: Update deps
iliana Aug 7, 2020
b54a66a
Bump version to 0.12.0
iliana Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ RUN make install
FROM sdk as sdk-musl
USER builder

ARG MUSLVER="1.2.0"
ARG MUSLVER="1.2.1"

WORKDIR /home/builder
COPY ./hashes/musl ./hashes
Expand Down Expand Up @@ -277,7 +277,7 @@ RUN \

ARG ARCH
ARG TARGET="${ARCH}-bottlerocket-linux-gnu"
ARG RUSTVER="1.43.1"
ARG RUSTVER="1.45.2"

USER builder
WORKDIR /home/builder
Expand Down Expand Up @@ -309,7 +309,7 @@ FROM sdk-libc as sdk-go

ARG ARCH
ARG TARGET="${ARCH}-bottlerocket-linux-gnu"
ARG GOVER="1.14.2"
ARG GOVER="1.14.7"

USER root
RUN dnf -y install golang
Expand Down Expand Up @@ -445,10 +445,7 @@ RUN \

# Strip and deduplicate Rust's LLVM libraries.
RUN \
export HOSTDIR="/usr/libexec/rust/lib/rustlib/x86_64-unknown-linux-gnu/" ; \
diff /usr/libexec/rust/lib/libLLVM-*.so ${HOSTDIR}/lib/libLLVM-*.so && \
strip -g /usr/libexec/rust/lib/libLLVM-*.so && \
ln -f /usr/libexec/rust/lib/libLLVM-*.so ${HOSTDIR}/lib/
strip -g /usr/libexec/rust/lib/libLLVM-*.so

# Add Go programs to $PATH and sync timestamps to avoid rebuilds.
RUN \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARCH ?= $(shell uname -m)

VERSION := v0.11.0
VERSION := v0.12.0
TAG := bottlerocket/sdk-$(ARCH):$(VERSION)
ARCHIVE := bottlerocket-sdk-$(ARCH)-$(VERSION).tar.gz

Expand Down
4 changes: 2 additions & 2 deletions hashes/go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# https://dl.google.com/go/go1.14.2.src.tar.gz
SHA512 (go1.14.2.src.tar.gz) = 3f6804e1a60df6a7c55c294fe4147b2d6f028c619ad4ae5b1ae8793c6be637a1e6a62721cc7ce0b28918ab3441a89fa9acda72cb5450bf5af8d7872411d28015
# https://dl.google.com/go/go1.14.7.src.tar.gz
SHA512 (go1.14.7.src.tar.gz) = 3f1133c66d7795ceb6c5793db90616613244d7561abaef6b059602992c0b7a53b6b6ebbcf69add4769a58542e9dc55871bcfe3d64d4cd9f3569bd435ade86dee
4 changes: 2 additions & 2 deletions hashes/musl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# https://musl.libc.org/releases/musl-1.2.0.tar.gz
SHA512 (musl-1.2.0.tar.gz) = 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1
# https://musl.libc.org/releases/musl-1.2.1.tar.gz
SHA512 (musl-1.2.1.tar.gz) = 455464ef47108a78457291bda2b1ea574987a1787f6001e9376956f20521593a4816bc215dab41c1a80292ae7ebd315accb4d4fa6a1210ff77d9a4d68239e960
18 changes: 9 additions & 9 deletions hashes/rust
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# https://static.rust-lang.org/dist/rustc-1.43.1-src.tar.xz
SHA512 (rustc-1.43.1-src.tar.xz) = 24bb01237b1f3f5412109290bb4406b9742cf8956162f4090a98ed3a59a6e2e8dda399452bec1c93c8afdcf5effd98e4825e7f218238e0e88735c1ff4a5b385f
### See https://github.com/rust-lang/rust/blob/1.43.1/src/stage0.txt for what to use below. ###
# https://static.rust-lang.org/dist/2020-03-12/rust-std-1.42.0-x86_64-unknown-linux-gnu.tar.xz
SHA512 (rust-std-1.42.0-x86_64-unknown-linux-gnu.tar.xz) = e10cb383923c34bb7ac3a5dacd1f7cb675331400bc70efa0ff72fc740d2d0f3f876d8f681a1d31fae40b137ac896be20d27fa603802d970857a9f7c1c88b08eb
# https://static.rust-lang.org/dist/2020-03-12/rustc-1.42.0-x86_64-unknown-linux-gnu.tar.xz
SHA512 (rustc-1.42.0-x86_64-unknown-linux-gnu.tar.xz) = d07eb0c2c8df31429484414ef20fb61338f42a054d76fafb8c0c37d6a2f38953a0e1838752c2f742128fc1943c0ba025e50da50a6b9ae6ae6c5c5c0d408a66ea
# https://static.rust-lang.org/dist/2020-03-12/cargo-0.43.0-x86_64-unknown-linux-gnu.tar.xz
SHA512 (cargo-0.43.0-x86_64-unknown-linux-gnu.tar.xz) = ca2450ad3c4b52ed2ddef2c98314862a22a45e84b525c0c91d7db2b2556e606f4f11b46bdcbe5856239aa3c68874c6485f0c92c7b635545caee384fd48cb2d15
# https://static.rust-lang.org/dist/rustc-1.45.2-src.tar.xz
SHA512 (rustc-1.45.2-src.tar.xz) = cc6250c0bc844e77ca6dd7ae013e434ed3009b001914114866ed31f28edf3960221454d131e298b15050e3b8153fb8298d509559c2f7307c64611aa8e36b4d25
### See https://github.com/rust-lang/rust/blob/1.45.2/src/stage0.txt for what to use below. ###
# https://static.rust-lang.org/dist/2020-06-04/rust-std-1.44.0-x86_64-unknown-linux-gnu.tar.xz
SHA512 (rust-std-1.44.0-x86_64-unknown-linux-gnu.tar.xz) = 40fb579b86a86717d79c92586a949e2278ff4a948def6499a75cb3d54cb5752d4602d5d82c7d1ca6a7e50b84fd218cb0e016f5bcbd971b8006d01b98b05850de
# https://static.rust-lang.org/dist/2020-06-04/rustc-1.44.0-x86_64-unknown-linux-gnu.tar.xz
SHA512 (rustc-1.44.0-x86_64-unknown-linux-gnu.tar.xz) = fa9ed7bd3d380a7b15cf1f000adb208f75ac6148d40926aa52f6865dd8ca6dcb086fac2e982dc8179cb0faf3d133649365e488bf86bf458b2a6711fb470d34b5
# https://static.rust-lang.org/dist/2020-06-04/cargo-0.45.0-x86_64-unknown-linux-gnu.tar.xz
SHA512 (cargo-0.45.0-x86_64-unknown-linux-gnu.tar.xz) = 9e55f503cebd3ff338c6ac05480ee249275d0c59efc6d189a78225cc3e2bfae323d6a2411f1631517bdc5601ecb3cd761333d1b0383e9b51fbca29be108594b9
Loading