rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 22:32:14 +00:00
Code Issues Releases Wiki Activity

v2.0.0-beta3

Browse Source 
- Share kernel with k3OS (5.4.0-54.60-rancher1)
- Buildroot 2020.02.8
- Docker 20.10.2
This commit is contained in:
Olli Janatuinen
2020-12-13 19:30:37 +02:00
parent d9e9511add
commit b31b3fe738
7 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/add-platform-specific.yml vendored
View File

@@ -18,7 +18,8 @@ jobs:
- name: Install github-release - name: Install github-release
run: | run: |
wget -O - -o /dev/null https://github.com/github-release/github-release/releases/download/v0.9.0/linux-amd64-github-release.bz2 | bunzip2 | sudo tee /usr/local/bin/github-release sudo wget https://github.com/github-release/github-release/releases/download/v0.9.0/linux-amd64-github-release.bz2 -O /usr/local/bin/github-release.bz2
sudo bunzip2 /usr/local/bin/github-release.bz2
sudo chmod 0755 /usr/local/bin/github-release sudo chmod 0755 /usr/local/bin/github-release
- name: Build OS - name: Build OS

3
.github/workflows/create-release.yml vendored
View File

@@ -18,7 +18,8 @@ jobs:
- name: Install github-release - name: Install github-release
run: | run: |
wget -O - -o /dev/null https://github.com/github-release/github-release/releases/download/v0.9.0/linux-amd64-github-release.bz2 | bunzip2 | sudo tee /usr/local/bin/github-release sudo wget https://github.com/github-release/github-release/releases/download/v0.9.0/linux-amd64-github-release.bz2 -O /usr/local/bin/github-release.bz2
sudo bunzip2 /usr/local/bin/github-release.bz2
sudo chmod 0755 /usr/local/bin/github-release sudo chmod 0755 /usr/local/bin/github-release
- name: Build OS - name: Build OS

25
Dockerfile.dapper
View File

@@ -60,14 +60,16 @@ ARG DISTRIB_ID=BurmillaOS
ARG SELINUX_POLICY_URL=https://github.com/burmilla/refpolicy/releases/download/v0.0.3/policy.29 ARG SELINUX_POLICY_URL=https://github.com/burmilla/refpolicy/releases/download/v0.0.3/policy.29
ARG KERNEL_VERSION=4.14.211-burmilla ARG KERNEL_VERSION=5.4.0-54.60-rancher1
ARG KERNEL_URL_amd64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-x86.tar.gz ARG KERNEL_URL_amd64=https://github.com/rancher/k3os-kernel/releases/download/${KERNEL_VERSION}/kernel-generic_amd64.tar.xz
ARG KERNEL_URL_arm64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-arm64.tar.gz ARG KERNEL_URL_arm64=https://github.com/rancher/k3os-kernel/releases/download/${KERNEL_VERSION}/kernel-generic_arm64.tar.xz
ARG KERNEL_URL_mips64el=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-mips64el.tar.xz
ARG BUILD_DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 ARG BUILD_DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3
ARG BUILD_DOCKER_URL_arm64=https://github.com/burmilla/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm64 ARG BUILD_DOCKER_URL_arm64=https://github.com/burmilla/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm64
ARG BUILD_DOCKER_URL_mips64el=https://github.com/burmilla/docker/releases/download/v1.10.3-ros1/docker-1.10.3_mips64el
ARG OS_RELEASES_YML=https://raw.githubusercontent.com/burmilla/releases/v1.9.x ARG OS_RELEASES_YML=https://raw.githubusercontent.com/burmilla/releases/v2.0.x
ARG OS_SERVICES_REPO=https://raw.githubusercontent.com/${OS_REPO}/os-services ARG OS_SERVICES_REPO=https://raw.githubusercontent.com/${OS_REPO}/os-services
ARG IMAGE_NAME=${OS_REPO}/os ARG IMAGE_NAME=${OS_REPO}/os
@@ -76,17 +78,20 @@ ARG OS_CONSOLE=default
ARG OS_AUTOFORMAT=false ARG OS_AUTOFORMAT=false
ARG OS_FIRMWARE=true ARG OS_FIRMWARE=true
ARG OS_BASE_URL_amd64=https://github.com/burmilla/os-base/releases/download/v2018.02.11-1/os-base_amd64.tar.xz ARG OS_BASE_URL_amd64=https://github.com/burmilla/os-base/releases/download/v2020.02.8-1/os-base_amd64.tar.xz
ARG OS_BASE_URL_arm64=https://github.com/burmilla/os-base/releases/download/v2018.02.11-1/os-base_arm64.tar.xz ARG OS_BASE_URL_arm64=https://github.com/burmilla/os-base/releases/download/v2020.02.8-1/os-base_arm64.tar.xz
ARG OS_BASE_URL_mips64el=https://github.com/burmilla/os-base/releases/download/v2020.02.8-1/os-base_mips64el.tar.xz
ARG OS_INITRD_BASE_URL_amd64=https://github.com/burmilla/os-initrd-base/releases/download/v2018.02.11-1/os-initrd-base-amd64.tar.gz ARG OS_INITRD_BASE_URL_amd64=https://github.com/burmilla/os-initrd-base/releases/download/v2020.02.8-1/os-initrd-base-amd64.tar.gz
ARG OS_INITRD_BASE_URL_arm64=https://github.com/burmilla/os-initrd-base/releases/download/v2018.02.11-1/os-initrd-base-arm64.tar.gz ARG OS_INITRD_BASE_URL_arm64=https://github.com/burmilla/os-initrd-base/releases/download/v2020.02.8-1/os-initrd-base-arm64.tar.gz
ARG OS_INITRD_BASE_URL_mips64el=https://github.com/burmilla/os-initrd-base/releases/download/v2020.02.8-1/os-initrd-base-mips64el.tar.gz
ARG SYSTEM_DOCKER_VERSION=17.06-ros6 ARG SYSTEM_DOCKER_VERSION=17.06-ros6
ARG SYSTEM_DOCKER_URL_amd64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz ARG SYSTEM_DOCKER_URL_amd64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
ARG SYSTEM_DOCKER_URL_arm64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz ARG SYSTEM_DOCKER_URL_arm64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
ARG SYSTEM_DOCKER_URL_mips64el=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-mips64el-${SYSTEM_DOCKER_VERSION}.tgz
ARG USER_DOCKER_VERSION=19.03.14 ARG USER_DOCKER_VERSION=20.10.2
ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION} ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}
ARG AZURE_SERVICE=false ARG AZURE_SERVICE=false
@@ -142,7 +147,7 @@ RUN mkdir -p ${DOWNLOADS}
RUN rm /bin/sh && ln -s /bin/bash /bin/sh RUN rm /bin/sh && ln -s /bin/bash /bin/sh
RUN echo "... Downloading ${!KERNEL_URL}"; \ RUN echo "... Downloading ${!KERNEL_URL}"; \
if [ -n "${!KERNEL_URL}" ]; then \ if [ -n "${!KERNEL_URL}" ]; then \
curl -fL ${!KERNEL_URL} > ${DOWNLOADS}/kernel.tar.gz \ curl -fL ${!KERNEL_URL} > ${DOWNLOADS}/kernel.tar.xz \
;fi ;fi
# Download SELinux Policy # Download SELinux Policy

1
images/01-base/Dockerfile
View File

@@ -25,7 +25,6 @@ RUN rm /sbin/poweroff /sbin/reboot /sbin/halt && \
passwd -l root && \ passwd -l root && \
addgroup -g 1100 rancher && \ addgroup -g 1100 rancher && \
addgroup -g 1101 docker && \ addgroup -g 1101 docker && \
addgroup -g 1103 sudo && \
adduser -u 1100 -G rancher -D -h /home/rancher -s /bin/bash rancher && \ adduser -u 1100 -G rancher -D -h /home/rancher -s /bin/bash rancher && \
adduser -u 1101 -G docker -D -h /home/docker -s /bin/bash docker && \ adduser -u 1101 -G docker -D -h /home/docker -s /bin/bash docker && \
adduser rancher docker && \ adduser rancher docker && \

4
scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper
View File

@@ -10,8 +10,8 @@ RUN mkdir -p /source/assets
COPY rootfs_arm64.tar.gz /source/assets/rootfs_arm64.tar.gz COPY rootfs_arm64.tar.gz /source/assets/rootfs_arm64.tar.gz
ENV KERNEL_URL=https://github.com/burmilla/os-rpi-kernel/releases/download/v4.14.114-burmilla/4.14.114-rancheros-v8.tar.gz ENV KERNEL_URL=https://github.com/burmilla/os-rpi-kernel/releases/download/v5.10.1-burmilla/5.10.1-burmilla-v8.tar.gz
ENV BOOTLOADER_URL=https://github.com/burmilla/os-rpi-kernel/releases/download/v4.14.114-burmilla/rpi-bootloader.tar.gz ENV BOOTLOADER_URL=https://github.com/burmilla/os-rpi-kernel/releases/download/v5.10.1-burmilla/rpi-bootloader.tar.gz
RUN curl -fL ${KERNEL_URL} > /source/assets/kernel.tar.gz RUN curl -fL ${KERNEL_URL} > /source/assets/kernel.tar.gz
RUN curl -fL ${BOOTLOADER_URL} > /source/assets/rpi-bootfiles.tar.gz RUN curl -fL ${BOOTLOADER_URL} > /source/assets/rpi-bootfiles.tar.gz

14
scripts/layout-kernel
View File

@@ -2,14 +2,14 @@
set -e set -e
# Override using a local kernel build # Override using a local kernel build
if [ -e ${DAPPER_SOURCE}/assets/kernel.tar.gz ]; then if [ -e ${DAPPER_SOURCE}/assets/kernel.tar.xz ]; then
echo "copying ${DAPPER_SOURCE}/assets/kernel.tar.gz ${DOWNLOADS}/kernel.tar.gz" echo "copying ${DAPPER_SOURCE}/assets/kernel.tar.xz ${DOWNLOADS}/kernel.tar.xz"
cp ${DAPPER_SOURCE}/assets/kernel.tar.gz ${DOWNLOADS}/kernel.tar.gz cp ${DAPPER_SOURCE}/assets/kernel.tar.xz ${DOWNLOADS}/kernel.tar.xz
fi fi
if [ -e ${DOWNLOADS}/kernel.tar.gz ]; then if [ -e ${DOWNLOADS}/kernel.tar.xz ]; then
mkdir -p ${BUILD}/kernel mkdir -p ${BUILD}/kernel
tar xf ${DOWNLOADS}/kernel.tar.gz -C ${BUILD}/kernel tar Jxf ${DOWNLOADS}/kernel.tar.xz -C ${BUILD}/kernel
for i in vmlinuz vmlinux; do for i in vmlinuz vmlinux; do
if [ -e ${BUILD}/kernel/boot/${i}-* ]; then if [ -e ${BUILD}/kernel/boot/${i}-* ]; then
@@ -24,7 +24,7 @@ if [ -e ${DOWNLOADS}/kernel.tar.gz ]; then
fi fi
done done
# TODO: move these into a separate tar.gz and add to the syslinux initrd line # TODO: move these into a separate tar.xz and add to the syslinux initrd line
if [ -d ${BUILD}/kernel/lib ]; then if [ -d ${BUILD}/kernel/lib ]; then
rm -rf ${INITRD_DIR}/usr/lib rm -rf ${INITRD_DIR}/usr/lib
cp -rf ${BUILD}/kernel/lib ${INITRD_DIR}/usr/ cp -rf ${BUILD}/kernel/lib ${INITRD_DIR}/usr/
@@ -51,7 +51,7 @@ if [ -e ${DOWNLOADS}/kernel.tar.gz ]; then
fi fi
else else
if [ "$ARCH" == "amd64" ]; then if [ "$ARCH" == "amd64" ]; then
echo "no ${DOWNLOADS}/kernel.tar.gz found" echo "no ${DOWNLOADS}/kernel.tar.xz found"
exit 1 exit 1
fi fi
fi fi

2
scripts/release-amd64
View File

@@ -10,7 +10,7 @@ touch dist/publish.sh
chmod 755 dist/publish.sh chmod 755 dist/publish.sh
if [ "$OS_FIRMWARE" = "false" ]; then if [ "$OS_FIRMWARE" = "false" ]; then
echo "github-release upload --user burmilla --repo os --tag ${VERSION} --file ./dist/artifacts/burmillaos.iso --name burmillaos-${VERSION}-nofirmware.iso" >> dist/publish.sh echo "github-release upload --user burmilla --repo os --tag ${VERSION} --file ./dist/artifacts/burmillaos.iso --name burmillaos-${VERSION}-vm.iso" >> dist/publish.sh
exit 0 exit 0
else else
echo "github-release release --user burmilla --repo os --tag ${VERSION} --pre-release --draft" > dist/publish.sh echo "github-release release --user burmilla --repo os --tag ${VERSION} --pre-release --draft" > dist/publish.sh