Update Dockerfile

docker/brook/Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile for Brook based alpine
-# Copyright (C) 2019 - 2020 Teddysun <[email protected]>
+# Copyright (C) 2019 - 2024 Teddysun <[email protected]>
 # Reference URL:
 # https://github.com/txthinking/brook
 

docker/brook/Dockerfile.architecture

@@ -1,9 +1,9 @@
 # Dockerfile for Brook based alpine
-# Copyright (C) 2019 - 2020 Teddysun <[email protected]>
+# Copyright (C) 2019 - 2024 Teddysun <[email protected]>
 # Reference URL:
 # https://github.com/txthinking/brook
 
-FROM --platform=${TARGETPLATFORM} alpine:latest
+FROM alpine:latest
 LABEL maintainer="Teddysun <[email protected]>"
 
 ARG TARGETPLATFORM

docker/caddy/Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile for caddy v1.0.5 based alpine
-# Copyright (C) 2021 Teddysun <[email protected]>
+# Copyright (C) 2021 - 2024 Teddysun <[email protected]>
 # Reference URL:
 # https://github.com/caddyserver/caddy
 # https://github.com/caddyserver/forwardproxy

docker/caddy/Dockerfile.architecture

@@ -1,10 +1,10 @@
 # Dockerfile for caddy v1.0.5 based alpine
-# Copyright (C) 2021 Teddysun <[email protected]>
+# Copyright (C) 2021 - 2024 Teddysun <[email protected]>
 # 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 <[email protected]>"
 
 ARG TARGETPLATFORM

docker/hysteria/Dockerfile.architecture

@@ -1,9 +1,9 @@
 # Dockerfile for hysteria based alpine
-# Copyright (C) 2023 Teddysun <[email protected]>
+# Copyright (C) 2023 - 2024 Teddysun <[email protected]>
 # Reference URL:
 # https://github.com/HyNetwork/hysteria
 
-FROM --platform=${TARGETPLATFORM} alpine:latest
+FROM alpine:latest
 LABEL maintainer="Teddysun <[email protected]>"
 
 ARG TARGETPLATFORM

docker/kms/Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile for KMS Server
-# Copyright (C) 2018 - 2020 Teddysun <[email protected]>
+# Copyright (C) 2018 - 2024 Teddysun <[email protected]>
 # Reference URL:
 # https://github.com/Wind4/vlmcsd
 

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 <[email protected]>"
 
 COPY --from=builder /root/vlmcsd/bin/vlmcsd /usr/bin/vlmcsd

docker/rpmbuild/Dockerfile.fedora37

@@ -1,7 +1,7 @@
 # Dockerfile for build RPM packages.
 # Copyright (C) 2023 Teddysun <[email protected]>
 
-FROM --platform=${TARGETPLATFORM} fedora:37
+FROM fedora:37
 LABEL maintainer="Teddysun <[email protected]>"
 
 RUN dnf install -y yum-utils && \

docker/rpmbuild/Dockerfile.fedora38

@@ -1,7 +1,7 @@
 # Dockerfile for build RPM packages.
 # Copyright (C) 2023 Teddysun <[email protected]>
 
-FROM --platform=${TARGETPLATFORM} fedora:38
+FROM fedora:38
 LABEL maintainer="Teddysun <[email protected]>"
 
 RUN dnf install -y yum-utils && \

docker/rpmbuild/Dockerfile.fedora39

@@ -1,7 +1,7 @@
 # Dockerfile for build RPM packages.
 # Copyright (C) 2023 Teddysun <[email protected]>
 
-FROM --platform=${TARGETPLATFORM} fedora:39
+FROM fedora:39
 LABEL maintainer="Teddysun <[email protected]>"
 
 RUN dnf install -y yum-utils && \

docker/rpmbuild/Dockerfile.fedora40

@@ -1,7 +1,7 @@
 # Dockerfile for build RPM packages.
 # Copyright (C) 2024 Teddysun <[email protected]>
 
-FROM --platform=${TARGETPLATFORM} fedora:40
+FROM fedora:40
 LABEL maintainer="Teddysun <[email protected]>"
 
 RUN dnf install -y yum-utils && \

docker/rpmbuild/Dockerfile.fedora41

@@ -0,0 +1,37 @@
+# Dockerfile for build RPM packages.
+# Copyright (C) 2024 Teddysun <[email protected]>
+
+FROM fedora:41
+LABEL maintainer="Teddysun <[email protected]>"
+
+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"]

docker/rpmbuild/Dockerfile.rpmbuild7

@@ -1,7 +1,7 @@
 # Dockerfile for build RPM packages.
 # Copyright (C) 2021 - 2022 Teddysun <[email protected]>
 
-FROM --platform=${TARGETPLATFORM} centos:7
+FROM centos:7
 LABEL maintainer="Teddysun <[email protected]>"
 
 RUN yum install -y yum-utils epel-release centos-release-scl-rh && \

docker/rpmbuild/Dockerfile.rpmbuild8

@@ -1,7 +1,7 @@
 # Dockerfile for build RPM packages.
-# Copyright (C) 2021 - 2022 Teddysun <[email protected]>
+# Copyright (C) 2021 - 2024 Teddysun <[email protected]>
 
-FROM --platform=${TARGETPLATFORM} rockylinux:8
+FROM rockylinux:8
 LABEL maintainer="Teddysun <[email protected]>"
 
 RUN yum install -y yum-utils epel-release && \

docker/rpmbuild/Dockerfile.rpmbuild9

@@ -1,7 +1,7 @@
 # Dockerfile for build RPM packages.
-# Copyright (C) 2022 Teddysun <[email protected]>
+# Copyright (C) 2022 - 2024 Teddysun <[email protected]>
 
-FROM --platform=${TARGETPLATFORM} rockylinux:9
+FROM rockylinux:9
 LABEL maintainer="Teddysun <[email protected]>"
 
 RUN yum install -y yum-utils epel-release && \

docker/trojan-go/Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile for trojan-go based alpine
-# Copyright (C) 2019 - 2021 Teddysun <[email protected]>
+# Copyright (C) 2019 - 2024 Teddysun <[email protected]>
 # Reference URL:
 # https://github.com/p4gefau1t/trojan-go
 # https://github.com/v2fly/v2ray-core

docker/trojan-go/Dockerfile.architecture

@@ -1,5 +1,5 @@
 # Dockerfile for trojan-go based alpine
-# Copyright (C) 2019 - 2023 Teddysun <[email protected]>
+# Copyright (C) 2019 - 2024 Teddysun <[email protected]>
 # 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 <[email protected]>"
 
 ARG TARGETPLATFORM

docker/trojan/Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile for trojan based alpine
-# Copyright (C) 2020 Teddysun <[email protected]>
+# Copyright (C) 2020 - 2024 Teddysun <[email protected]>
 # Reference URL:
 # https://github.com/trojan-gfw/trojan
 # https://trojan-gfw.github.io/trojan/

docker/trojan/Dockerfile.architecture

@@ -1,10 +1,10 @@
 # Dockerfile for trojan based alpine
-# Copyright (C) 2020 Teddysun <[email protected]>
+# Copyright (C) 2020 - 2024 Teddysun <[email protected]>
 # 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 <[email protected]>"
 
 RUN set -ex \

docker/v2ray/Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile for v2ray based alpine
-# Copyright (C) 2019 - 2021 Teddysun <[email protected]>
+# Copyright (C) 2019 - 2024 Teddysun <[email protected]>
 # Reference URL:
 # https://github.com/v2fly/v2ray-core
 # https://github.com/v2fly/geoip

docker/v2ray/Dockerfile.architecture

@@ -1,11 +1,11 @@
 # Dockerfile for v2ray based alpine
-# Copyright (C) 2019 - 2021 Teddysun <[email protected]>
+# Copyright (C) 2019 - 2024 Teddysun <[email protected]>
 # 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 <[email protected]>"
 
 ARG TARGETPLATFORM

docker/xray/Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile for xray based alpine
-# Copyright (C) 2019 - 2021 Teddysun <[email protected]>
+# Copyright (C) 2019 - 2024 Teddysun <[email protected]>
 # Reference URL:
 # https://github.com/XTLS/Xray-core
 # https://github.com/v2fly/v2ray-core

docker/xray/Dockerfile.architecture

@@ -1,12 +1,12 @@
 # Dockerfile for xray based alpine
-# Copyright (C) 2019 - 2021 Teddysun <[email protected]>
+# Copyright (C) 2019 - 2024 Teddysun <[email protected]>
 # 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 <[email protected]>"
 
 ARG TARGETPLATFORM

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"
         }
       ]
     }