Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Rebase alpine image at edge tar file #938

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Rebase alpine image at edge tar file #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cff1eba
Rebase alpine image at edge tar file
Sfinx Jun 28, 2022
20c062b
Add 5.18.8 kernel
Sfinx Jun 29, 2022
4dbba0b
Remove unused stuff in alpine image
Sfinx Jun 30, 2022
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
15 changes: 13 additions & 2 deletions images/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
FROM scratch
# TODO: Base this on the alpine docker image, not the FC ext4 image
# Bases on the alpine edge tar file
ADD alpine.tar /
# Add an SSH server and start it automatically
RUN apk add \
RUN apk add --no-cache \
openssh \
openrc \
util-linux \
udev \
bash

Expand All @@ -16,3 +18,12 @@ RUN rc-update add sshd && \
RUN echo "exit 0" > /etc/init.d/networking
RUN echo "PermitTTY yes" >> /etc/ssh/sshd_config
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
# set the default root password for agetty
RUN echo root:root | chpasswd
# configure agetty
RUN ln -s /etc/init.d/agetty /etc/init.d/agetty.ttyS0
RUN ln -s /etc/init.d/agetty.ttyS0 /etc/runlevels/default
RUN ln -s /etc/init.d/agetty.ttyS0 /etc/runlevels/nonetwork
# remove unused getty processes
RUN sed -i "s/^tty/#tty/g" /etc/inittab
RUN echo "Welcome to Ignite Alpine !" > /etc/motd
17 changes: 11 additions & 6 deletions images/alpine/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@ DOCKER_USER?=weaveworks

all: build

alpine.ext4:
curl -sSL https://s3.amazonaws.com/spec.ccfc.min/img/hello/fsfiles/hello-rootfs.ext4 > alpine.ext4
#alpine.ext4:
# curl -sSL https://s3.amazonaws.com/spec.ccfc.min/img/hello/fsfiles/hello-rootfs.ext4 > alpine.ext4

#alpine.tar: alpine.ext4
# sudo mount -o loop $(shell pwd)/alpine.ext4 ${TEMP_DIR}
# cd ${TEMP_DIR} && sudo tar -cf $(shell pwd)/alpine.tar .
# sudo umount $(shell pwd)/alpine.ext4

alpine.tar:
curl -sSL https://github.com/alpinelinux/docker-alpine/raw/edge/x86_64/alpine-minirootfs-20220328-x86_64.tar.gz > alpine.tar.gz
gzip -d alpine.tar.gz

alpine.tar: alpine.ext4
sudo mount -o loop $(shell pwd)/alpine.ext4 ${TEMP_DIR}
cd ${TEMP_DIR} && sudo tar -cf $(shell pwd)/alpine.tar .
sudo umount $(shell pwd)/alpine.ext4
# alpine.tar
build:
docker build -t ${DOCKER_USER}/ignite-alpine:${VERSION} .
Expand Down
4 changes: 2 additions & 2 deletions images/kernel/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ REGISTRY?=weaveworks
IMAGE_NAME?=${REGISTRY}/ignite-kernel
KERNEL_BUILDER_NAME=${REGISTRY}/ignite-kernel-builder
# Check https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/refs/ for updates
KERNEL_VERSIONS ?= 4.14.254 4.19.215 5.4.157 5.10.77 5.14.16 # If you update this, please keep the .github/workflows/release-kernel-images.yml matrix up to date
KERNEL_VERSIONS ?= 4.14.254 4.19.215 5.4.157 5.10.77 5.14.16 5.18.8 # If you update this, please keep the .github/workflows/release-kernel-images.yml matrix up to date
GOARCH?=amd64
GOARCH_LIST = amd64 arm64

ifeq ($(GOARCH),amd64)
KERNEL_ARCH=x86
KERNEL_ARCH=x86_64
VMLINUX_PATH=vmlinux
endif
ifeq ($(GOARCH),arm64)
Expand Down
4 changes: 2 additions & 2 deletions images/kernel/builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:18.04 AS builder
FROM ubuntu:22.04 AS builder

ARG GCC_VERSION="gcc-7"
ARG GCC_VERSION="gcc-12"

# Install dependencies
RUN apt-get update -y && \
Expand Down
Loading