Skip to content
This repository was archived by the owner on Oct 11, 2023. It is now read-only.

Convert installer to go #1456

Merged
SvenDowideit merged 20 commits into from
Jan 16, 2017
Merged

Convert installer to go #1456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
19e8c84
Wait for device partitions in type-0 Packet instance installs
joshwget Jan 6, 2017
4155dee
Run bootstrap services even if autoformat isn't set
joshwget Jan 5, 2017
80820e6
Allow question marks in unquoted kernel parameters
joshwget Jan 5, 2017
087bc6f
Convert install script to go
SvenDowideit Dec 1, 2016
cc78ff7
make the iso run also get the ssh and cloud-init so testing the insta…
SvenDowideit Dec 4, 2016
f5193d0
Started separating out the kernel modules from initrd, but there are …
SvenDowideit Dec 6, 2016
47eaf2b
can't work yet - need the host fs to have the iso mounted...
SvenDowideit Dec 6, 2016
85bdaa6
previous&current isolinux/syslinux cfg works for fresh install, and .…
SvenDowideit Dec 7, 2016
1a0e818
make ros install --append work
SvenDowideit Dec 7, 2016
d90217a
quieten the debug messages for install, fix pre-0.8.0-rc2 installer c…
SvenDowideit Dec 7, 2016
6503928
the os-installer base Dockerfile
SvenDowideit Dec 8, 2016
11e7889
port the use of parted to go
SvenDowideit Dec 15, 2016
f5230f1
add integration tests for iso boot, install and then boot from disk.
SvenDowideit Dec 15, 2016
7519325
try to simplify logging
SvenDowideit Dec 15, 2016
bdb0d32
Add isolinux cfg files to installer, and add ros to base installer fo…
SvenDowideit Dec 19, 2016
2a57583
Installing 0.7.1, and then rebooting, and doing a ros upgrade to a fa…
SvenDowideit Dec 20, 2016
6bbed5f
start testing the version number of our install/upgrade test
SvenDowideit Dec 22, 2016
e5a7889
make --fresh apply to the second disk too
SvenDowideit Dec 22, 2016
edb8022
fix create-installer to use the installer tarball in the iso
SvenDowideit Jan 16, 2017
4f1418d
disable the old upgrade test - it can't work as things are
SvenDowideit Jan 16, 2017
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
10 changes: 7 additions & 3 deletions Dockerfile.dapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ RUN apt-get update && \
dosfstools \
gccgo \
genisoimage \
gettext \
git \
Copy link

@thaJeztah thaJeztah Dec 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👋 may want to check your editor settings; looks like all new lines use tabs, but the existing file uses spaces (here and other files

Copy link
Contributor Author

@SvenDowideit SvenDowideit Dec 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hate spaces 🗡
tabs forever !!!!

Copy link

@thaJeztah thaJeztah Dec 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you been talking with tianon? :trollface:

Copy link
Contributor Author

@SvenDowideit SvenDowideit Dec 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought tianon preferred spaces 📦

isolinux \
less \
Expand All @@ -34,7 +35,7 @@ RUN apt-get update && \
ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST
ENV DAPPER_DOCKER_SOCKET true
ENV DAPPER_SOURCE /go/src/github.com/rancher/os
ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd
ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel
ENV DAPPER_RUN_ARGS --privileged
ENV TRASH_CACHE ${DAPPER_SOURCE}/.trash-cache
ENV SHELL /bin/bash
Expand All @@ -55,7 +56,8 @@ 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_URL_amd64=https://github.com/rancher/os-kernel/releases/download/v4.9-rancher2/linux-4.9-rancher2-x86.tar.gz
ARG KERNEL_VERSION_amd64=4.9.3-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

ARG DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz
Expand Down Expand Up @@ -100,6 +102,7 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
GOARCH=$ARCH \
HOSTNAME_DEFAULT=${HOSTNAME_DEFAULT} \
IMAGE_NAME=${IMAGE_NAME} \
KERNEL_VERSION=${KERNEL_VERSION_amd64} \
KERNEL_URL=KERNEL_URL_${ARCH} \
KERNEL_URL_amd64=${KERNEL_URL_amd64} \
KERNEL_URL_arm64=${KERNEL_URL_arm64} \
Expand All @@ -119,7 +122,8 @@ RUN mkdir -p ${DOWNLOADS}

# Download kernel
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
RUN if [ -n "${!KERNEL_URL}" ]; then \
RUN echo "... Downloading ${!KERNEL_URL}"; \
if [ -n "${!KERNEL_URL}" ]; then \
curl -fL ${!KERNEL_URL} > ${DOWNLOADS}/kernel.tar.gz \
;fi

Expand Down
Loading