Fix rpi64 build

(cherry picked from commit dcce547bad)
Fix build error caused by golint
2018-10-17 14:27:41 +08:00 · 2018-10-17 14:26:32 +08:00 · 2018-02-06 16:51:35 +08:00 · 2018-02-05 17:59:41 +08:00 · 2018-02-05 16:23:06 +08:00 · 2018-01-26 10:33:31 +08:00
7 changed files with 39 additions and 37 deletions
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -35,7 +35,8 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox
        vim \
        wget \
        xorriso \
-	telnet
+        xz-utils \
+        telnet

 ########## Dapper Configuration #####################

@@ -63,7 +64,7 @@ ARG DOCKER_BUILD_VERSION=1.10.3
 ARG DOCKER_BUILD_PATCH_VERSION=v${DOCKER_BUILD_VERSION}-ros1
 ARG SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.3/policy.29

-ARG KERNEL_VERSION_amd64=4.9.69-rancher
+ARG KERNEL_VERSION_amd64=4.9.78-rancher
 ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/v${KERNEL_VERSION_amd64}/linux-${KERNEL_VERSION_amd64}-x86.tar.gz
 #ARG KERNEL_URL_arm64=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.4.0-arm64.8/linux-4.4.0-rancher-arm64.tar.gz

@@ -153,7 +154,7 @@ RUN curl -fL ${!BUILD_DOCKER_URL} > /usr/bin/docker && \
 RUN go get github.com/rancher/trash

 # Install golint
-RUN go get github.com/golang/lint/golint
+RUN go get golang.org/x/lint/golint

 RUN go get gopkg.in/check.v1

--- a/README.md
+++ b/README.md
@@ -14,12 +14,12 @@ it would really be bad if somebody did `docker rm -f $(docker ps -qa)` and delet

 ## Stable Release

-**v1.1.1 - Docker 17.03.2-ce - Linux 4.9.67**
+**v1.1.4 - Docker 17.06.2-ce - Linux 4.9.78**

 ### ISO

 - https://releases.rancher.com/os/latest/rancheros.iso
- https://releases.rancher.com/os/v1.1.1/rancheros.iso
+- https://releases.rancher.com/os/v1.1.4/rancheros.iso

 ### Additional Downloads

@@ -34,16 +34,16 @@ it would really be bad if somebody did `docker rm -f $(docker ps -qa)` and delet
 * https://releases.rancher.com/os/latest/rootfs.tar.gz
 * https://releases.rancher.com/os/latest/vmlinuz

-#### v1.1.1 Links
+#### v1.1.4 Links

-* https://releases.rancher.com/os/v1.1.1/initrd
-* https://releases.rancher.com/os/v1.1.1/iso-checksums.txt
-* https://releases.rancher.com/os/v1.1.1/rancheros-openstack.img
-* https://releases.rancher.com/os/v1.1.1/rancheros-digitalocean.img
-* https://releases.rancher.com/os/v1.1.1/rancheros.ipxe
-* https://releases.rancher.com/os/v1.1.1/rancheros-gce.tar.gz
-* https://releases.rancher.com/os/v1.1.1/rootfs.tar.gz
-* https://releases.rancher.com/os/v1.1.1/vmlinuz
+* https://releases.rancher.com/os/v1.1.4/initrd
+* https://releases.rancher.com/os/v1.1.4/iso-checksums.txt
+* https://releases.rancher.com/os/v1.1.4/rancheros-openstack.img
+* https://releases.rancher.com/os/v1.1.4/rancheros-digitalocean.img
+* https://releases.rancher.com/os/v1.1.4/rancheros.ipxe
+* https://releases.rancher.com/os/v1.1.4/rancheros-gce.tar.gz
+* https://releases.rancher.com/os/v1.1.4/rootfs.tar.gz
+* https://releases.rancher.com/os/v1.1.4/vmlinuz

 **Note**: you can use `http` instead of `https` in the above URLs, e.g. for iPXE.

@@ -55,20 +55,21 @@ SSH keys are added to the **`rancher`** user, so you must log in using the **ran

 Region | Type | AMI |
 -------|------|------
-ap-south-1 | HVM | [ami-97ade5f8](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-97ade5f8)
-eu-west-2 | HVM | [ami-82a5bbe6](https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#launchInstanceWizard:ami=ami-82a5bbe6)
-eu-west-1 | HVM | [ami-c5b134bc](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-c5b134bc)
-ap-northeast-2 | HVM | [ami-6c54f202](https://ap-northeast-2.console.aws.amazon.com/ec2/home?region=ap-northeast-2#launchInstanceWizard:ami=ami-6c54f202)
-ap-northeast-1 | HVM | [ami-ece6648a](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-ece6648a)
-sa-east-1 | HVM | [ami-0750166b](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-0750166b)
-ca-central-1 | HVM | [ami-1cdd6778](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-1cdd6778)
-ap-southeast-1 | HVM | [ami-f4e58488](https://ap-southeast-1.console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchInstanceWizard:ami=ami-f4e58488)
-ap-southeast-2 | HVM | [ami-1544b377](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-1544b377)
-eu-central-1 | HVM | [ami-b632bad9](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-b632bad9)
-us-east-1 | HVM | [ami-4584ec3f](https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#launchInstanceWizard:ami=ami-4584ec3f)
-us-east-2 | HVM | [ami-4695bc23](https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#launchInstanceWizard:ami=ami-4695bc23)
-us-west-1 | HVM | [ami-d24e4ab2](https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#launchInstanceWizard:ami=ami-d24e4ab2)
-us-west-2 | HVM | [ami-99cb6de1](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-99cb6de1)
+ap-south-1 | HVM | [ami-20b1e24f](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-20b1e24f)
+eu-west-3 | HVM | [ami-41a2143c](https://eu-west-3.console.aws.amazon.com/ec2/home?region=eu-west-3#launchInstanceWizard:ami=ami-41a2143c)
+eu-west-2 | HVM | [ami-cea247a9](https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#launchInstanceWizard:ami=ami-cea247a9)
+eu-west-1 | HVM | [ami-365f364f](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-365f364f)
+ap-northeast-2 | HVM | [ami-57d07239](https://ap-northeast-2.console.aws.amazon.com/ec2/home?region=ap-northeast-2#launchInstanceWizard:ami=ami-57d07239)
+ap-northeast-1 | HVM | [ami-75720513](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-75720513)
+sa-east-1 | HVM | [ami-08074964](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-08074964)
+ca-central-1 | HVM | [ami-359e1a51](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-359e1a51)
+ap-southeast-1 | HVM | [ami-88feb8f4](https://ap-southeast-1.console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchInstanceWizard:ami=ami-88feb8f4)
+ap-southeast-2 | HVM | [ami-b4f50ed6](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-b4f50ed6)
+eu-central-1 | HVM | [ami-f034509f](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-f034509f)
+us-east-1 | HVM | [ami-8f404ef5](https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#launchInstanceWizard:ami=ami-8f404ef5)
+us-east-2 | HVM | [ami-9393a6f6](https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#launchInstanceWizard:ami=ami-9393a6f6)
+us-west-1 | HVM | [ami-00969960](https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#launchInstanceWizard:ami=ami-00969960)
+us-west-2 | HVM | [ami-c2a226ba](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-c2a226ba)

 Additionally, images are available with support for Amazon EC2 Container Service (ECS) [here](https://docs.rancher.com/os/amazon-ecs/#amazon-ecs-enabled-amis).

@@ -76,7 +77,7 @@ Additionally, images are available with support for Amazon EC2 Container Service

 We are providing a disk image that users can download and import for use in Google Compute Engine. The image can be obtained from the release artifacts for RancherOS.

-[Download Image](https://releases.rancher.com/os/v1.1.1/rancheros-gce.tar.gz)
+[Download Image](https://releases.rancher.com/os/v1.1.4/rancheros-gce.tar.gz)

 Please follow the directions at our [docs to launch in GCE](http://docs.rancher.com/os/running-rancheros/cloud/gce/).

--- a/cmd/control/os.go
+++ b/cmd/control/os.go
@@ -210,7 +210,7 @@ func osVersion(c *cli.Context) error {
 	return nil
 }

-func startUpgradeContainer(image string, stage, force, reboot, kexec, debug bool, upgradeConsole bool, kernelArgs string) error {
+func startUpgradeContainer(image string, stage, force, reboot, kexec, upgradeConsole, debug bool, kernelArgs string) error {
 	command := []string{
 		"-t", "rancher-upgrade",
 		"-r", config.Version,
--- a/config/cloudinit/datasource/url/url.go
+++ b/config/cloudinit/datasource/url/url.go
@@ -34,7 +34,7 @@ func NewDatasource(url string) *RemoteFile {
 func (f *RemoteFile) IsAvailable() bool {
 	network.SetProxyEnvironmentVariables()
 	client := pkg.NewHTTPClient()
-	_, f.lastError = client.Get(f.url)
+	_, f.lastError = client.GetRetry(f.url)
 	return (f.lastError == nil)
 }

--- a/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper
+++ b/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper
@@ -1,5 +1,5 @@
 FROM rancher/os-debianconsole-base
-# FROM amd64=debian:jessie arm64=aarch64/debian:jessie arm=armhf/debian:jessie
+# FROM amd64=ubuntu:xenial arm64=arm64v8/ubuntu:xenial

 ENV DAPPER_RUN_ARGS --privileged
 ENV DAPPER_OUTPUT dist
@@ -13,11 +13,11 @@ RUN mkdir -p /source/assets
 COPY rootfs_arm64.tar.gz /source/assets/rootfs_arm64.tar.gz

 ENV URL=https://github.com/DieterReuter/rpi64-kernel/releases/download
-ENV VER=v20171216-172054
+ENV VER=v20180114-121512

-RUN curl -fL ${URL}/${VER}/4.9.69-hypriotos-v8.tar.gz > /source/assets/kernel.tar.gz
+RUN curl -fL ${URL}/${VER}/4.9.76-hypriotos-v8.tar.gz > /source/assets/kernel.tar.gz
 RUN curl -fL ${URL}/${VER}/bootfiles.tar.gz > /source/assets/bootfiles.tar.gz
-RUN curl -fL https://github.com/DieterReuter/rpi-bootloader/releases/download/v20171216-171651/rpi-bootloader.tar.gz > /source/assets/rpi-bootfiles.tar.gz
+RUN curl -fL https://github.com/DieterReuter/rpi-bootloader/releases/download/v20180114-121611/rpi-bootloader.tar.gz > /source/assets/rpi-bootfiles.tar.gz

 #ENV RPI_URL=https://github.com/raspberrypi/firmware/raw/master/boot
 #RUN curl -fL ${RPI_URL}/bootcode.bin > /source/assets/bootcode.bin
--- a/scripts/images/raspberry-pi-hypriot64/scripts/build.sh
+++ b/scripts/images/raspberry-pi-hypriot64/scripts/build.sh
@@ -18,7 +18,7 @@ BOOT_PARTITION_SIZE=25
 BOOT_PARTITION_OFFSET="$((BOOT_PARTITION_START*512))"
 BOOT_PARTITION_BYTES="$((BOOT_PARTITION_SIZE*1024*1024))"
 BOOT_PARTITION_SECTORS="$((BOOT_PARTITION_SIZE*1024*2))"
-ROOT_PARTITION_START="$((BOOT_PARTITION_START+BOOT_PARTITION_SECTORS))"
+ROOT_PARTITION_START="$((BOOT_PARTITION_START+BOOT_PARTITION_SECTORS+1))"
 ROOT_PARTITION_OFFSET="$((ROOT_PARTITION_START*512))"
 #---don't change here---

--- a/scripts/tar-images
+++ b/scripts/tar-images
@@ -13,5 +13,5 @@ for i in $IMAGES; do
 done

 echo "tar-images: docker save ${IMAGES} > build/images.tar"
-docker save ${IMAGES} > build/images.tar
+docker save ${IMAGES} | xz > build/images.tar
 echo "tar-images: DONE"
Author	SHA1	Message	Date
niusmallnan	f5f342b597	Fix rpi64 build (cherry picked from commit `dcce547bad`)	2018-10-17 14:27:41 +08:00
niusmallnan	da859e9fbb	Fix build error caused by golint	2018-10-17 14:26:32 +08:00
niusmallnan	757ad174cb	Update README for v1.1.4	2018-02-06 16:51:35 +08:00
niusmallnan	7ca6be6dc5	Reduce the memory consumption at startup (#2247 ) Offline image is automatically loaded when the system boots. When the system memory is not large enough (such as 1G), will lead to kernel panic.	2018-02-05 17:59:41 +08:00
niusmallnan	f2dbc8cd4f	Adjust the parameter upgrade-console order (#2246 )	2018-02-05 16:23:06 +08:00
niusmallnan	84996b22b7	Fix a typo path for rpi kernel url	2018-01-26 10:33:31 +08:00
niusmallnan	8123859494	Bump to rpi kernel 4.9.76	2018-01-26 09:59:32 +08:00
niusmallnan	310fa03a0c	GetRetry is used when detecting if url is available (#2237 )	2018-01-26 09:51:09 +08:00
niusmallnan	8c0f0bcedf	Bump to kernel v4.9.78 It can address CVE-2017-5715	2018-01-26 09:46:20 +08:00
niusmallnan	089bd0ce2d	Update README for v1.1.3	2018-01-08 13:30:32 +08:00
niusmallnan	2b27fb8a4c	Bump to kernel v4.9.75 It can address CVE-2017-5754	2018-01-06 08:39:00 +08:00