chore: update Dockerfiles for ARMv6 and ARMv7 builds, remove obsolete files

This commit is contained in:
Cédric Verstraeten
2025-09-09 17:01:12 +02:00
parent ff864fde75
commit 5e586a9f06
5 changed files with 6 additions and 122 deletions

View File

@@ -24,6 +24,6 @@ jobs:
- name: Available platforms
run: echo ${{ steps.buildx.outputs.platforms }}
- name: Run Buildx
run: docker buildx build --platform linux/arm/v6 -t kerberos/base:armv6-$(echo $GITHUB_SHA | cut -c1-7) -f Dockerfile-armv6 --push .
run: docker buildx build --platform linux/arm/v6 -t kerberos/base:armv6-$(echo $GITHUB_SHA | cut -c1-7) --push .
- name: Append manifest
run: docker buildx imagetools create --append -t kerberos/base:$(echo $GITHUB_SHA | cut -c1-7) kerberos/base:armv6-$(echo $GITHUB_SHA | cut -c1-7)

View File

@@ -24,6 +24,6 @@ jobs:
- name: Available platforms
run: echo ${{ steps.buildx.outputs.platforms }}
- name: Run Buildx
run: docker buildx build --platform linux/arm/v7 -t kerberos/base:armv7-$(echo $GITHUB_SHA | cut -c1-7) -f Dockerfile-armv7 --push .
run: docker buildx build --platform linux/arm/v7 -t kerberos/base:armv7-$(echo $GITHUB_SHA | cut -c1-7) --push .
- name: Append manifest
run: docker buildx imagetools create --append -t kerberos/base:$(echo $GITHUB_SHA | cut -c1-7) kerberos/base:armv7-$(echo $GITHUB_SHA | cut -c1-7)

View File

@@ -1,5 +1,5 @@
FROM debian:bookworm AS builder
LABEL Author=Kerberos.io
FROM golang:1.24.5-bullseye
LABEL AUTHOR=uug.ai
RUN apt-get update && apt-get upgrade -y && apt-get install -y wget build-essential \
cmake libc-ares-dev uuid-dev daemon libwebsockets-dev git \
@@ -20,7 +20,7 @@ RUN git clone https://code.videolan.org/videolan/x264.git && \
# Clone and build FFMpeg & OpenCV
RUN git clone https://github.com/FFmpeg/FFmpeg && \
cd FFmpeg && git checkout n6.0.1 && \
cd FFmpeg && git checkout n7.0.3 && \
./configure --prefix=/usr/local --target-os=linux --enable-nonfree \
--extra-ldflags="-latomic" \
--enable-avfilter \
@@ -31,19 +31,3 @@ RUN git clone https://github.com/FFmpeg/FFmpeg && \
make && \
make install && \
cd .. && rm -rf FFmpeg
############################
# Build Golang
ENV GOROOT=/usr/local/go
ENV GOPATH=/go
ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH
RUN ARCH=$(uname -m) && \
ARCH=$([ "$(uname -m)" = "armv7l" ] && echo "armv6l" || echo $ARCH) && \
ARCH=$([ "$(uname -m)" = "x86_64" ] && echo "amd64" || echo $ARCH) && \
ARCH=$([ "$(uname -m)" = "aarch64" ] && echo "arm64" || echo $ARCH) && \
wget "https://dl.google.com/go/go1.24.2.linux-$ARCH.tar.gz" && \
tar -xvf "go1.24.2.linux-$ARCH.tar.gz" && \
rm -rf go1.24.2.linux-$ARCH.tar.gz && \
mv go /usr/local

View File

@@ -1,50 +0,0 @@
FROM balenalib/rpi-raspbian:bullseye-20221229 AS builder
LABEL Author=Kerberos.io
RUN apt-get update && apt-get upgrade -y && apt-get install -y wget build-essential \
cmake libc-ares-dev uuid-dev daemon libwebsockets-dev git \
cmake wget dh-autoreconf autotools-dev autoconf automake gcc \
build-essential libtool make ca-certificates nasm tar unzip wget pkg-config
#############################
# Static build x264
RUN git clone https://code.videolan.org/videolan/x264.git && \
cd x264 && git checkout 0a84d986 && \
./configure --prefix=/usr/local --enable-static --enable-pic && \
make && \
make install && \
cd .. && rm -rf x264
#################################
# Clone and build FFMpeg & OpenCV
RUN git clone https://github.com/FFmpeg/FFmpeg && \
cd FFmpeg && git checkout n6.0.1 && \
./configure --prefix=/usr/local --target-os=linux --enable-nonfree \
--extra-ldflags="-latomic" \
--enable-avfilter \
--disable-zlib \
--enable-gpl \
--extra-libs=-latomic \
--enable-static --disable-shared && \
make && \
make install && \
cd .. && rm -rf FFmpeg
############################
# Build Golang
ENV GOROOT=/usr/local/go
ENV GOPATH=/go
ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH
RUN ARCH=$(uname -m) && \
ARCH=$([ "$(uname -m)" = "armv7l" ] && echo "armv6l" || echo $ARCH) && \
ARCH=$([ "$(uname -m)" = "x86_64" ] && echo "amd64" || echo $ARCH) && \
ARCH=$([ "$(uname -m)" = "aarch64" ] && echo "arm64" || echo $ARCH) && \
wget "https://dl.google.com/go/go1.24.2.linux-$ARCH.tar.gz" && \
tar -xvf "go1.24.2.linux-$ARCH.tar.gz" && \
rm -rf go1.24.2.linux-$ARCH.tar.gz && \
mv go /usr/local

View File

@@ -1,50 +0,0 @@
FROM balenalib/raspberrypi3:20221215 AS builder
LABEL Author=Kerberos.io
RUN apt-get update && apt-get upgrade -y && apt-get install -y wget build-essential \
cmake libc-ares-dev uuid-dev daemon libwebsockets-dev git \
cmake wget dh-autoreconf autotools-dev autoconf automake gcc \
build-essential libtool make ca-certificates nasm tar unzip wget pkg-config
#############################
# Static build x264
RUN git clone https://code.videolan.org/videolan/x264.git && \
cd x264 && git checkout 0a84d986 && \
./configure --prefix=/usr/local --enable-static --enable-pic && \
make && \
make install && \
cd .. && rm -rf x264
#################################
# Clone and build FFMpeg & OpenCV
RUN git clone https://github.com/FFmpeg/FFmpeg && \
cd FFmpeg && git checkout n6.0.1 && \
./configure --prefix=/usr/local --target-os=linux --enable-nonfree \
--extra-ldflags="-latomic" \
--enable-avfilter \
--disable-zlib \
--enable-gpl \
--extra-libs=-latomic \
--enable-static --disable-shared && \
make && \
make install && \
cd .. && rm -rf FFmpeg
############################
# Build Golang
ENV GOROOT=/usr/local/go
ENV GOPATH=/go
ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH
RUN ARCH=$(uname -m) && \
ARCH=$([ "$(uname -m)" = "armv7l" ] && echo "armv6l" || echo $ARCH) && \
ARCH=$([ "$(uname -m)" = "x86_64" ] && echo "amd64" || echo $ARCH) && \
ARCH=$([ "$(uname -m)" = "aarch64" ] && echo "arm64" || echo $ARCH) && \
wget "https://dl.google.com/go/go1.24.2.linux-$ARCH.tar.gz" && \
tar -xvf "go1.24.2.linux-$ARCH.tar.gz" && \
rm -rf go1.24.2.linux-$ARCH.tar.gz && \
mv go /usr/local