From 168062f2dea2fd0a6c4612d4579410f58d50afdc Mon Sep 17 00:00:00 2001 From: Teddysun Date: Sun, 29 Dec 2024 23:22:33 +0900 Subject: [PATCH] Update Dockerfile --- docker/brook/Dockerfile | 2 +- docker/brook/Dockerfile.architecture | 4 +-- docker/caddy/Dockerfile | 2 +- docker/caddy/Dockerfile.architecture | 4 +-- docker/hysteria/Dockerfile.architecture | 4 +-- docker/kms/Dockerfile | 2 +- docker/kms/Dockerfile.architecture | 4 +-- docker/rpmbuild/Dockerfile.fedora37 | 2 +- docker/rpmbuild/Dockerfile.fedora38 | 2 +- docker/rpmbuild/Dockerfile.fedora39 | 2 +- docker/rpmbuild/Dockerfile.fedora40 | 2 +- docker/rpmbuild/Dockerfile.fedora41 | 37 ++++++++++++++++++++++++ docker/rpmbuild/Dockerfile.rpmbuild7 | 2 +- docker/rpmbuild/Dockerfile.rpmbuild8 | 4 +-- docker/rpmbuild/Dockerfile.rpmbuild9 | 4 +-- docker/trojan-go/Dockerfile | 2 +- docker/trojan-go/Dockerfile.architecture | 4 +-- docker/trojan/Dockerfile | 2 +- docker/trojan/Dockerfile.architecture | 6 ++-- docker/v2ray/Dockerfile | 2 +- docker/v2ray/Dockerfile.architecture | 4 +-- docker/xray/Dockerfile | 2 +- docker/xray/Dockerfile.architecture | 4 +-- docker/xray/README.md | 4 +-- 24 files changed, 71 insertions(+), 36 deletions(-) create mode 100644 docker/rpmbuild/Dockerfile.fedora41 diff --git a/docker/brook/Dockerfile b/docker/brook/Dockerfile index ff6a2fd..f5ef0a4 100644 --- a/docker/brook/Dockerfile +++ b/docker/brook/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile for Brook based alpine -# Copyright (C) 2019 - 2020 Teddysun +# Copyright (C) 2019 - 2024 Teddysun # Reference URL: # https://github.com/txthinking/brook diff --git a/docker/brook/Dockerfile.architecture b/docker/brook/Dockerfile.architecture index 5b788f8..a6d865f 100644 --- a/docker/brook/Dockerfile.architecture +++ b/docker/brook/Dockerfile.architecture @@ -1,9 +1,9 @@ # Dockerfile for Brook based alpine -# Copyright (C) 2019 - 2020 Teddysun +# Copyright (C) 2019 - 2024 Teddysun # Reference URL: # https://github.com/txthinking/brook -FROM --platform=${TARGETPLATFORM} alpine:latest +FROM alpine:latest LABEL maintainer="Teddysun " ARG TARGETPLATFORM diff --git a/docker/caddy/Dockerfile b/docker/caddy/Dockerfile index 8091786..9eac396 100644 --- a/docker/caddy/Dockerfile +++ b/docker/caddy/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile for caddy v1.0.5 based alpine -# Copyright (C) 2021 Teddysun +# Copyright (C) 2021 - 2024 Teddysun # Reference URL: # https://github.com/caddyserver/caddy # https://github.com/caddyserver/forwardproxy diff --git a/docker/caddy/Dockerfile.architecture b/docker/caddy/Dockerfile.architecture index 4121dc4..4fcc5a2 100644 --- a/docker/caddy/Dockerfile.architecture +++ b/docker/caddy/Dockerfile.architecture @@ -1,10 +1,10 @@ # Dockerfile for caddy v1.0.5 based alpine -# Copyright (C) 2021 Teddysun +# Copyright (C) 2021 - 2024 Teddysun # Reference URL: # https://github.com/caddyserver/caddy # https://github.com/caddyserver/forwardproxy -FROM --platform=${TARGETPLATFORM} alpine:3.14 +FROM alpine:3.14 LABEL maintainer="Teddysun " ARG TARGETPLATFORM diff --git a/docker/hysteria/Dockerfile.architecture b/docker/hysteria/Dockerfile.architecture index 5746238..005b9aa 100644 --- a/docker/hysteria/Dockerfile.architecture +++ b/docker/hysteria/Dockerfile.architecture @@ -1,9 +1,9 @@ # Dockerfile for hysteria based alpine -# Copyright (C) 2023 Teddysun +# Copyright (C) 2023 - 2024 Teddysun # Reference URL: # https://github.com/HyNetwork/hysteria -FROM --platform=${TARGETPLATFORM} alpine:latest +FROM alpine:latest LABEL maintainer="Teddysun " ARG TARGETPLATFORM diff --git a/docker/kms/Dockerfile b/docker/kms/Dockerfile index 597fe5a..a68d0f9 100644 --- a/docker/kms/Dockerfile +++ b/docker/kms/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile for KMS Server -# Copyright (C) 2018 - 2020 Teddysun +# Copyright (C) 2018 - 2024 Teddysun # Reference URL: # https://github.com/Wind4/vlmcsd diff --git a/docker/kms/Dockerfile.architecture b/docker/kms/Dockerfile.architecture index 84e1ee9..597fe5a 100644 --- a/docker/kms/Dockerfile.architecture +++ b/docker/kms/Dockerfile.architecture @@ -3,14 +3,14 @@ # Reference URL: # https://github.com/Wind4/vlmcsd -FROM --platform=$TARGETPLATFORM alpine:latest AS builder +FROM alpine:latest AS builder WORKDIR /root RUN apk add --no-cache git make build-base && \ git clone --branch master --single-branch https://github.com/Wind4/vlmcsd.git && \ cd vlmcsd/ && \ make -FROM --platform=$TARGETPLATFORM alpine:latest +FROM alpine:latest LABEL maintainer="Teddysun " COPY --from=builder /root/vlmcsd/bin/vlmcsd /usr/bin/vlmcsd diff --git a/docker/rpmbuild/Dockerfile.fedora37 b/docker/rpmbuild/Dockerfile.fedora37 index 7c4b288..c0cace6 100644 --- a/docker/rpmbuild/Dockerfile.fedora37 +++ b/docker/rpmbuild/Dockerfile.fedora37 @@ -1,7 +1,7 @@ # Dockerfile for build RPM packages. # Copyright (C) 2023 Teddysun -FROM --platform=${TARGETPLATFORM} fedora:37 +FROM fedora:37 LABEL maintainer="Teddysun " RUN dnf install -y yum-utils && \ diff --git a/docker/rpmbuild/Dockerfile.fedora38 b/docker/rpmbuild/Dockerfile.fedora38 index 209f440..05d1398 100644 --- a/docker/rpmbuild/Dockerfile.fedora38 +++ b/docker/rpmbuild/Dockerfile.fedora38 @@ -1,7 +1,7 @@ # Dockerfile for build RPM packages. # Copyright (C) 2023 Teddysun -FROM --platform=${TARGETPLATFORM} fedora:38 +FROM fedora:38 LABEL maintainer="Teddysun " RUN dnf install -y yum-utils && \ diff --git a/docker/rpmbuild/Dockerfile.fedora39 b/docker/rpmbuild/Dockerfile.fedora39 index 5bd4bb5..5606e10 100644 --- a/docker/rpmbuild/Dockerfile.fedora39 +++ b/docker/rpmbuild/Dockerfile.fedora39 @@ -1,7 +1,7 @@ # Dockerfile for build RPM packages. # Copyright (C) 2023 Teddysun -FROM --platform=${TARGETPLATFORM} fedora:39 +FROM fedora:39 LABEL maintainer="Teddysun " RUN dnf install -y yum-utils && \ diff --git a/docker/rpmbuild/Dockerfile.fedora40 b/docker/rpmbuild/Dockerfile.fedora40 index 519a25b..018fa32 100644 --- a/docker/rpmbuild/Dockerfile.fedora40 +++ b/docker/rpmbuild/Dockerfile.fedora40 @@ -1,7 +1,7 @@ # Dockerfile for build RPM packages. # Copyright (C) 2024 Teddysun -FROM --platform=${TARGETPLATFORM} fedora:40 +FROM fedora:40 LABEL maintainer="Teddysun " RUN dnf install -y yum-utils && \ diff --git a/docker/rpmbuild/Dockerfile.fedora41 b/docker/rpmbuild/Dockerfile.fedora41 new file mode 100644 index 0000000..4292a58 --- /dev/null +++ b/docker/rpmbuild/Dockerfile.fedora41 @@ -0,0 +1,37 @@ +# Dockerfile for build RPM packages. +# Copyright (C) 2024 Teddysun + +FROM fedora:41 +LABEL maintainer="Teddysun " + +RUN dnf install -y yum-utils && \ + dnf install -y tar wget git tree gcc gcc-c++ vim automake \ + sudo net-tools make cmake zstd libzstd chkconfig libtool \ + bash coreutils diffutils patch ca-certificates pcre-devel \ + rpm-build rpm-devel rpmlint rpmdevtools ncurses which procps \ + asciidoc audit-libs-devel binutils-devel flex jq gettext mbedtls-devel \ + libcap-devel newt-devel pciutils-devel perl-generators c-ares-devel libev-devel \ + python3 python3-devel python3-docutils rsync xmlto bc bison libsodium-devel \ + java-devel ncurses-devel numactl-devel openssl-devel perl-devel \ + bpftool dwarves gcc-plugin-devel glibc-static hmaccalc kernel-rpm-macros \ + libbabeltrace-devel libbpf-devel libcap-ng-devel libnl3-devel libtraceevent-devel \ + elfutils-devel xz-devel perl-ExtUtils-Embed && \ + dnf clean all && rm -rf /var/cache/dnf /var/lib/rpm/__db* + +RUN useradd builder -u 1000 -m -G users,wheel && \ + echo "builder ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers && \ + echo "# macros" > /home/builder/.rpmmacros && \ + echo "%_topdir /home/builder/rpmbuild" >> /home/builder/.rpmmacros && \ + echo "%_sourcedir %{_topdir}" >> /home/builder/.rpmmacros && \ + echo "%_builddir %{_topdir}" >> /home/builder/.rpmmacros && \ + echo "%_specdir %{_topdir}" >> /home/builder/.rpmmacros && \ + echo "%_rpmdir %{_topdir}" >> /home/builder/.rpmmacros && \ + echo "%_srcrpmdir %{_topdir}" >> /home/builder/.rpmmacros && \ + echo "set enable-bracketed-paste off" >> /etc/inputrc && \ + mkdir -p /home/builder/rpmbuild && \ + chown -R builder /home/builder + +USER builder +VOLUME /home/builder +WORKDIR /home/builder/rpmbuild +CMD ["/bin/bash"] diff --git a/docker/rpmbuild/Dockerfile.rpmbuild7 b/docker/rpmbuild/Dockerfile.rpmbuild7 index 3a4d8a1..f6e20e8 100644 --- a/docker/rpmbuild/Dockerfile.rpmbuild7 +++ b/docker/rpmbuild/Dockerfile.rpmbuild7 @@ -1,7 +1,7 @@ # Dockerfile for build RPM packages. # Copyright (C) 2021 - 2022 Teddysun -FROM --platform=${TARGETPLATFORM} centos:7 +FROM centos:7 LABEL maintainer="Teddysun " RUN yum install -y yum-utils epel-release centos-release-scl-rh && \ diff --git a/docker/rpmbuild/Dockerfile.rpmbuild8 b/docker/rpmbuild/Dockerfile.rpmbuild8 index a481c95..a1e6397 100644 --- a/docker/rpmbuild/Dockerfile.rpmbuild8 +++ b/docker/rpmbuild/Dockerfile.rpmbuild8 @@ -1,7 +1,7 @@ # Dockerfile for build RPM packages. -# Copyright (C) 2021 - 2022 Teddysun +# Copyright (C) 2021 - 2024 Teddysun -FROM --platform=${TARGETPLATFORM} rockylinux:8 +FROM rockylinux:8 LABEL maintainer="Teddysun " RUN yum install -y yum-utils epel-release && \ diff --git a/docker/rpmbuild/Dockerfile.rpmbuild9 b/docker/rpmbuild/Dockerfile.rpmbuild9 index 3cb3fbb..d1581ee 100644 --- a/docker/rpmbuild/Dockerfile.rpmbuild9 +++ b/docker/rpmbuild/Dockerfile.rpmbuild9 @@ -1,7 +1,7 @@ # Dockerfile for build RPM packages. -# Copyright (C) 2022 Teddysun +# Copyright (C) 2022 - 2024 Teddysun -FROM --platform=${TARGETPLATFORM} rockylinux:9 +FROM rockylinux:9 LABEL maintainer="Teddysun " RUN yum install -y yum-utils epel-release && \ diff --git a/docker/trojan-go/Dockerfile b/docker/trojan-go/Dockerfile index 282f623..2be7d53 100644 --- a/docker/trojan-go/Dockerfile +++ b/docker/trojan-go/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile for trojan-go based alpine -# Copyright (C) 2019 - 2021 Teddysun +# Copyright (C) 2019 - 2024 Teddysun # Reference URL: # https://github.com/p4gefau1t/trojan-go # https://github.com/v2fly/v2ray-core diff --git a/docker/trojan-go/Dockerfile.architecture b/docker/trojan-go/Dockerfile.architecture index c679b2d..dbd05e2 100644 --- a/docker/trojan-go/Dockerfile.architecture +++ b/docker/trojan-go/Dockerfile.architecture @@ -1,5 +1,5 @@ # Dockerfile for trojan-go based alpine -# Copyright (C) 2019 - 2023 Teddysun +# Copyright (C) 2019 - 2024 Teddysun # Reference URL: # https://github.com/p4gefau1t/trojan-go # https://github.com/v2fly/v2ray-core @@ -7,7 +7,7 @@ # https://github.com/v2fly/domain-list-community # https://github.com/Potterli20/trojan-go-fork -FROM --platform=${TARGETPLATFORM} alpine:latest +FROM alpine:latest LABEL maintainer="Teddysun " ARG TARGETPLATFORM diff --git a/docker/trojan/Dockerfile b/docker/trojan/Dockerfile index a6ef3c2..12e61db 100644 --- a/docker/trojan/Dockerfile +++ b/docker/trojan/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile for trojan based alpine -# Copyright (C) 2020 Teddysun +# Copyright (C) 2020 - 2024 Teddysun # Reference URL: # https://github.com/trojan-gfw/trojan # https://trojan-gfw.github.io/trojan/ diff --git a/docker/trojan/Dockerfile.architecture b/docker/trojan/Dockerfile.architecture index 1507f19..12e61db 100644 --- a/docker/trojan/Dockerfile.architecture +++ b/docker/trojan/Dockerfile.architecture @@ -1,10 +1,10 @@ # Dockerfile for trojan based alpine -# Copyright (C) 2020 Teddysun +# Copyright (C) 2020 - 2024 Teddysun # Reference URL: # https://github.com/trojan-gfw/trojan # https://trojan-gfw.github.io/trojan/ -FROM --platform=${TARGETPLATFORM} alpine:latest AS builder +FROM alpine:latest AS builder WORKDIR /root RUN set -ex \ && VERSION="$(wget --no-check-certificate -qO- https://api.github.com/repos/trojan-gfw/trojan/tags | grep 'name' | cut -d\" -f4 | head -1)" \ @@ -15,7 +15,7 @@ RUN set -ex \ && make \ && strip -s trojan -FROM --platform=${TARGETPLATFORM} alpine:latest +FROM alpine:latest LABEL maintainer="Teddysun " RUN set -ex \ diff --git a/docker/v2ray/Dockerfile b/docker/v2ray/Dockerfile index 7af4e2b..033fec4 100644 --- a/docker/v2ray/Dockerfile +++ b/docker/v2ray/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile for v2ray based alpine -# Copyright (C) 2019 - 2021 Teddysun +# Copyright (C) 2019 - 2024 Teddysun # Reference URL: # https://github.com/v2fly/v2ray-core # https://github.com/v2fly/geoip diff --git a/docker/v2ray/Dockerfile.architecture b/docker/v2ray/Dockerfile.architecture index f06cafe..5fa43b4 100644 --- a/docker/v2ray/Dockerfile.architecture +++ b/docker/v2ray/Dockerfile.architecture @@ -1,11 +1,11 @@ # Dockerfile for v2ray based alpine -# Copyright (C) 2019 - 2021 Teddysun +# Copyright (C) 2019 - 2024 Teddysun # Reference URL: # https://github.com/v2fly/v2ray-core # https://github.com/v2fly/geoip # https://github.com/v2fly/domain-list-community -FROM --platform=${TARGETPLATFORM} alpine:latest +FROM alpine:latest LABEL maintainer="Teddysun " ARG TARGETPLATFORM diff --git a/docker/xray/Dockerfile b/docker/xray/Dockerfile index 9b1a216..77c80de 100644 --- a/docker/xray/Dockerfile +++ b/docker/xray/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile for xray based alpine -# Copyright (C) 2019 - 2021 Teddysun +# Copyright (C) 2019 - 2024 Teddysun # Reference URL: # https://github.com/XTLS/Xray-core # https://github.com/v2fly/v2ray-core diff --git a/docker/xray/Dockerfile.architecture b/docker/xray/Dockerfile.architecture index da09ead..853c391 100644 --- a/docker/xray/Dockerfile.architecture +++ b/docker/xray/Dockerfile.architecture @@ -1,12 +1,12 @@ # Dockerfile for xray based alpine -# Copyright (C) 2019 - 2021 Teddysun +# Copyright (C) 2019 - 2024 Teddysun # Reference URL: # https://github.com/XTLS/Xray-core # https://github.com/v2fly/v2ray-core # https://github.com/v2fly/geoip # https://github.com/v2fly/domain-list-community -FROM --platform=${TARGETPLATFORM} alpine:latest +FROM alpine:latest LABEL maintainer="Teddysun " ARG TARGETPLATFORM diff --git a/docker/xray/README.md b/docker/xray/README.md index 0aa446b..8f089d6 100644 --- a/docker/xray/README.md +++ b/docker/xray/README.md @@ -40,9 +40,7 @@ A sample in JSON like below: "settings": { "clients": [ { - "id": "1eb6e917-774b-4a84-aff6-b058577c60a5", - "level": 1, - "alterId": 64 + "id": "1eb6e917-774b-4a84-aff6-b058577c60a5" } ] }