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

chore: upgrade Go to 1.15.1

Browse Source 
See:

* https://github.com/talos-systems/pkgs/pull/161
* https://github.com/talos-systems/tools/pull/104

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
This commit is contained in:
Andrey Smirnov 2020-09-04 00:56:10 +03:00 committed by talos-bot
parent ec01bcf874
commit 8ad43d4b1f
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Dockerfile
View File

@ -288,34 +288,34 @@ COPY --from=talosctl-darwin-build /talosctl-darwin-amd64 /talosctl-darwin-amd64
# The kernel target is the linux kernel.
FROM scratch AS kernel
COPY --from=docker.io/autonomy/kernel:v0.2.0-35-g8be6358 /boot/vmlinuz /vmlinuz
COPY --from=docker.io/autonomy/kernel:v0.3.0-1-g6d96d15 /boot/vmlinuz /vmlinuz
# The rootfs target provides the Talos rootfs.
FROM build AS rootfs-base
COPY --from=docker.io/autonomy/fhs:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/ca-certificates:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/containerd:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/dosfstools:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/eudev:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/iptables:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/libressl:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/libseccomp:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/linux-firmware:v0.2.0-35-g8be6358 /lib/firmware/bnx2 /rootfs/lib/firmware/bnx2
COPY --from=docker.io/autonomy/linux-firmware:v0.2.0-35-g8be6358 /lib/firmware/bnx2x /rootfs/lib/firmware/bnx2x
COPY --from=docker.io/autonomy/lvm2:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/libaio:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/musl:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/open-iscsi:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/open-isns:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/runc:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/socat:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/xfsprogs:v0.2.0-35-g8be6358 / /rootfs
COPY --from=docker.io/autonomy/util-linux:v0.2.0-35-g8be6358 /lib/libblkid.* /rootfs/lib/
COPY --from=docker.io/autonomy/util-linux:v0.2.0-35-g8be6358 /lib/libuuid.* /rootfs/lib/
COPY --from=docker.io/autonomy/util-linux:v0.2.0-35-g8be6358 /lib/libmount.* /rootfs/lib/
COPY --from=docker.io/autonomy/kmod:v0.2.0-35-g8be6358 /usr/lib/libkmod.* /rootfs/lib/
COPY --from=docker.io/autonomy/kernel:v0.2.0-35-g8be6358 /lib/modules /rootfs/lib/modules
COPY --from=docker.io/autonomy/fhs:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/ca-certificates:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/containerd:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/dosfstools:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/eudev:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/iptables:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/libressl:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/libseccomp:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/linux-firmware:v0.3.0-1-g6d96d15 /lib/firmware/bnx2 /rootfs/lib/firmware/bnx2
COPY --from=docker.io/autonomy/linux-firmware:v0.3.0-1-g6d96d15 /lib/firmware/bnx2x /rootfs/lib/firmware/bnx2x
COPY --from=docker.io/autonomy/lvm2:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/libaio:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/musl:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/open-iscsi:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/open-isns:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/runc:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/socat:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/xfsprogs:v0.3.0-1-g6d96d15 / /rootfs
COPY --from=docker.io/autonomy/util-linux:v0.3.0-1-g6d96d15 /lib/libblkid.* /rootfs/lib/
COPY --from=docker.io/autonomy/util-linux:v0.3.0-1-g6d96d15 /lib/libuuid.* /rootfs/lib/
COPY --from=docker.io/autonomy/util-linux:v0.3.0-1-g6d96d15 /lib/libmount.* /rootfs/lib/
COPY --from=docker.io/autonomy/kmod:v0.3.0-1-g6d96d15 /usr/lib/libkmod.* /rootfs/lib/
COPY --from=docker.io/autonomy/kernel:v0.3.0-1-g6d96d15 /lib/modules /rootfs/lib/modules
COPY --from=machined /machined /rootfs/sbin/init
COPY --from=apid-image /apid.tar /rootfs/usr/images/
COPY --from=bootkube-image /bootkube.tar /rootfs/usr/images/
@ -386,8 +386,8 @@ RUN apk add --no-cache --update \
syslinux \
util-linux \
xfsprogs
COPY --from=docker.io/autonomy/syslinux:v0.2.0-35-g8be6358 / /
COPY --from=docker.io/autonomy/grub:v0.2.0-35-g8be6358 / /
COPY --from=docker.io/autonomy/syslinux:v0.3.0-1-g6d96d15 / /
COPY --from=docker.io/autonomy/grub:v0.3.0-1-g6d96d15 / /
COPY --from=kernel /vmlinuz /usr/install/vmlinuz
COPY --from=initramfs /initramfs.xz /usr/install/initramfs.xz
COPY --from=installer-build /installer /bin/installer

4
Makefile
View File

@ -7,8 +7,8 @@ REGISTRY_AND_USERNAME := $(REGISTRY)/$(USERNAME)
DOCKER_LOGIN_ENABLED ?= true
ARTIFACTS := _out
TOOLS ?= autonomy/tools:v0.2.0-11-g1976029
GO_VERSION ?= 1.14
TOOLS ?= autonomy/tools:v0.3.0-1-g66c4c43
GO_VERSION ?= 1.15
GOFUMPT_VERSION ?= abc0db2c416aca0f60ea33c23c76665f6e7ba0b6
IMPORTVET ?= autonomy/importvet:f6b07d9
OPERATING_SYSTEM := $(shell uname -s | tr "[:upper:]" "[:lower:]")