dowerx/images
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linuxserver/docker-baseimage-{alpine,alpine-nginx,ubuntu}

Browse Source
This commit is contained in:
BENEDEK László 2024-10-06 23:10:25 +02:00
parent 4c4cdcd4e2
commit 275fff6c6b
7 changed files with 227 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitmodules vendored Normal file
View File

@ -0,0 +1,9 @@
[submodule "linuxserver/docker-baseimage-alpine"]
path = linuxserver/docker-baseimage-alpine
url = https://github.com/linuxserver/docker-baseimage-alpine.git
[submodule "linuxserver/docker-baseimage-alpine-nginx"]
path = linuxserver/docker-baseimage-alpine-nginx
url = https://github.com/linuxserver/docker-baseimage-alpine-nginx.git
[submodule "linuxserver/docker-baseimage-ubuntu"]
path = linuxserver/docker-baseimage-ubuntu
url = https://github.com/linuxserver/docker-baseimage-ubuntu.git

35
linuxserver/docker-baseimage-alpine-nginx.build.yml Normal file
View File

@ -0,0 +1,35 @@
registries:
- registry.tek.govt.hu
repos:
- name: baseimage-alpine-nginx
path: docker-baseimage-alpine-nginx
library: linuxserver
args:
- key: BUILD_DATE
value: "${BUILD_DATE}"
- key: VERSION
value: "${VERSION}"
tags:
- name: latest
tags:
- amd64
- arm64
- armv7
- name: 3.20-1.26.2
tags:
- 3.20-1.26.2-amd64
- 3.20-1.26.2-arm64
- 3.20-1.26.2-armv7
builds:
- arch: amd64
tags:
- amd64
- 3.20-1.26.2-amd64
- arch: arm64
tags:
- arm64
- 3.20-1.26.2-arm64
- arch: arm/v7
tags:
- armv7
- 3.20-1.26.2-armv7

50
linuxserver/docker-baseimage-alpine.build.yml Normal file
View File

@ -0,0 +1,50 @@
registries:
- registry.tek.govt.hu
repos:
- name: baseimage-alpine
path: docker-baseimage-alpine
library: linuxserver
args:
- key: BUILD_DATE
value: "${BUILD_DATE}"
- key: VERSION
value: "${VERSION}"
tags:
- name: latest
tags:
- amd64
- arm64
- armv7
- name: "3.20"
tags:
- 3.20-amd64
- 3.20-arm64
- 3.20-armv7
builds:
- arch: amd64
tags:
- amd64
- 3.20-amd64
args:
- key: ARCH
value: x86_64
- key: S6_OVERLAY_ARCH
value: x86_64
- arch: arm64
tags:
- arm64
- 3.20-arm64
args:
- key: ARCH
value: aarch64
- key: S6_OVERLAY_ARCH
value: aarch64
- arch: arm/v7
tags:
- armv7
- 3.20-armv7
args:
- key: ARCH
value: armv7
- key: S6_OVERLAY_ARCH
value: armhf

56
linuxserver/docker-baseimage-ubuntu.build.yml Normal file
View File

@ -0,0 +1,56 @@
registries:
- registry.tek.govt.hu
repos:
- name: baseimage-ubuntu
path: docker-baseimage-ubuntu
library: linuxserver
args:
- key: BUILD_DATE
value: "${BUILD_DATE}"
- key: VERSION
value: "${VERSION}"
tags:
- name: latest
tags:
- amd64
- arm64
- armv7
- name: "jammy"
tags:
- jammy-amd64
- jammy-arm64
- jammy-armv7
builds:
- arch: amd64
tags:
- amd64
- jammy-amd64
args:
- key: ARCH
value: amd64
- key: S6_OVERLAY_ARCH
value: x86_64
- arch: arm64
dockerfile: Dockerfile.aarch64
tags:
- arm64
- jammy-arm64
args:
- key: ARCH
value: arm64
- key: S6_OVERLAY_ARCH
value: aarch64
- key: QEMU_ARCH
value: aarch64
- arch: arm/v7
dockerfile: Dockerfile.aarch64
tags:
- armv7
- jammy-armv7
args:
- key: ARCH
value: armhf
- key: S6_OVERLAY_ARCH
value: armhf
- key: QEMU_ARCH
value: arm

12
linuxserver/patches/docker-baseimage-alpine-nginx.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/Dockerfile b/Dockerfile
index 4242db9..c2b5b57 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20
+FROM registry.tek.govt.hu/linuxserver/baseimage-alpine:3.20
# set version label
ARG BUILD_DATE

13
linuxserver/patches/docker-baseimage-alpine.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/Dockerfile b/Dockerfile
index ed2d94a..3d93b00 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ FROM alpine:3.19 AS rootfs-stage
# environment
ENV ROOTFS=/root-out
ENV REL=v3.20
-ENV ARCH=x86_64
+ARG ARCH=x86_64
ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine
ENV PACKAGES=alpine-baselayout,\
alpine-keys,\

52
linuxserver/patches/docker-baseimage-ubuntu.patch Normal file
View File

@ -0,0 +1,52 @@
diff --git a/Dockerfile b/Dockerfile
index f761a5b..9f99a82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
# syntax=docker/dockerfile:1
-FROM alpine:3.17 as rootfs-stage
+FROM alpine:3.19 AS rootfs-stage
# environment
ENV REL=jammy
-ENV ARCH=amd64
+ARG ARCH=amd64
# install packages
RUN \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index dda5328..26d57ae 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -4,7 +4,7 @@ FROM alpine:3.17 as rootfs-stage
# environment
ENV REL=jammy
-ENV ARCH=arm64
+ARG ARCH=arm64
# install packages
RUN \
@@ -53,6 +53,8 @@ ARG LSIOWN_VERSION="v1"
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="TheLamer"
+ARG QEMU_ARCH=aarch64
+
ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods"
ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run"
ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown"
@@ -132,9 +134,9 @@ RUN \
/lsiopy && \
echo "**** add qemu ****" && \
curl -o \
- /usr/bin/qemu-aarch64-static -L \
- "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \
- chmod +x /usr/bin/qemu-aarch64-static && \
+ /usr/bin/qemu-${QEMU_ARCH}-static -L \
+ "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-${QEMU_ARCH}-static" && \
+ chmod +x /usr/bin/qemu-${QEMU_ARCH}-static && \
echo "**** cleanup ****" && \
apt-get autoremove && \
apt-get clean && \