alt-orchestra/talos
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

chore: bump tools/pkgs for toolchain refactor

Browse Source 
This also pulls in Go 1.13.3

See  talos-systems/toolchain#8, talos-systems/tools#82,
https://github.com/talos-systems/pkgs/pull/69

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
This commit is contained in:
Andrey Smirnov 2019-10-25 19:32:53 +03:00 committed by Andrey Smirnov
parent 573cce8d18
commit c3e353aa45
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Dockerfile
View File

@ -199,30 +199,30 @@ COPY --from=osctl-darwin-build /osctl-darwin-amd64 /osctl-darwin-amd64
# The kernel target is the linux kernel.
FROM scratch AS kernel
COPY --from=docker.io/autonomy/kernel:dad1273 /boot/vmlinuz /vmlinuz
COPY --from=docker.io/autonomy/kernel:dad1273 /boot/vmlinux /vmlinux
COPY --from=docker.io/autonomy/kernel:13f49f2 /boot/vmlinuz /vmlinuz
COPY --from=docker.io/autonomy/kernel:13f49f2 /boot/vmlinux /vmlinux
# The rootfs target provides the Talos rootfs.
FROM build AS rootfs-base
COPY --from=docker.io/autonomy/fhs:dad1273 / /rootfs
COPY --from=docker.io/autonomy/ca-certificates:dad1273 / /rootfs
COPY --from=docker.io/autonomy/containerd:dad1273 / /rootfs
COPY --from=docker.io/autonomy/cni:dad1273 / /rootfs
COPY --from=docker.io/autonomy/dosfstools:dad1273 / /rootfs
COPY --from=docker.io/autonomy/eudev:dad1273 / /rootfs
COPY --from=docker.io/autonomy/iptables:dad1273 / /rootfs
COPY --from=docker.io/autonomy/libressl:dad1273 / /rootfs
COPY --from=docker.io/autonomy/libseccomp:dad1273 / /rootfs
COPY --from=docker.io/autonomy/musl:dad1273 / /rootfs
COPY --from=docker.io/autonomy/runc:dad1273 / /rootfs
COPY --from=docker.io/autonomy/socat:dad1273 / /rootfs
COPY --from=docker.io/autonomy/syslinux:dad1273 / /rootfs
COPY --from=docker.io/autonomy/xfsprogs:dad1273 / /rootfs
COPY --from=docker.io/autonomy/util-linux:dad1273 /lib/libblkid.* /rootfs/lib
COPY --from=docker.io/autonomy/util-linux:dad1273 /lib/libuuid.* /rootfs/lib
COPY --from=docker.io/autonomy/kmod:dad1273 /lib/libkmod.* /rootfs/lib
COPY --from=docker.io/autonomy/kernel:dad1273 /lib/modules /rootfs/lib/modules
COPY --from=docker.io/autonomy/fhs:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/ca-certificates:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/containerd:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/cni:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/dosfstools:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/eudev:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/iptables:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/libressl:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/libseccomp:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/musl:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/runc:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/socat:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/syslinux:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/xfsprogs:13f49f2 / /rootfs
COPY --from=docker.io/autonomy/util-linux:13f49f2 /lib/libblkid.* /rootfs/lib
COPY --from=docker.io/autonomy/util-linux:13f49f2 /lib/libuuid.* /rootfs/lib
COPY --from=docker.io/autonomy/kmod:13f49f2 /lib/libkmod.* /rootfs/lib
COPY --from=docker.io/autonomy/kernel:13f49f2 /lib/modules /rootfs/lib/modules
COPY --from=machined /machined /rootfs/sbin/init
COPY images/apid.tar /rootfs/usr/images/
COPY images/ntpd.tar /rootfs/usr/images/

2
Makefile
View File

@ -1,4 +1,4 @@
TOOLS ?= autonomy/tools:08059cc
TOOLS ?= autonomy/tools:8fdb32d
# TODO(andrewrynhard): Move this logic to a shell script.
BUILDKIT_VERSION ?= v0.6.0