diff --git a/Dockerfile b/Dockerfile index ac5a5a6421b9c943edb695735d7a3fcaad3e615a..bcf82d541ba03dee05e362d41ca8509989aa10ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,13 @@ -FROM alpine:3.14 +FROM ubuntu +ARG DEBIAN_FRONTEND=noninteractive ENV LANG=zh_CN.UTF-8 \ TZ=Asia/Shanghai \ PS1="\u@\h:\w \$ " -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \ - && apk add --update --no-cache \ +RUN apt update \ + && apt install -y --no-install-recommends \ nginx \ - nginx-mod-stream \ - openjdk8-jre \ + libnginx-mod-stream \ + openjdk-8-jre \ net-tools \ curl \ wget \ @@ -14,8 +15,7 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories fontconfig \ tzdata \ tini \ - acme.sh \ - sqlite \ + sqlite3 \ && fc-cache -f -v \ && ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime \ && echo "${TZ}" > /etc/timezone \ @@ -24,4 +24,3 @@ COPY target/nginxWebUI-*.jar /home/nginxWebUI.jar COPY entrypoint.sh /usr/local/bin/entrypoint.sh VOLUME ["/home/nginxWebUI"] ENTRYPOINT ["tini", "entrypoint.sh"] - diff --git a/buildx.sh b/buildx.sh index c91e46dc7bc68f503d00f7c9100e4e1a3b09597c..4a4a04de67641b776d3888d084884f647cf736c6 100755 --- a/buildx.sh +++ b/buildx.sh @@ -10,7 +10,7 @@ set -o pipefail ## 基本信息 repo="cym1102/nginxwebui" -arch="linux/386,linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x" +arch="linux/amd64,linux/arm64,linux/arm/v7" ver=$(cat pom.xml | grep -A1 nginxWebUI | grep version | grep -oP "\d+\.\d+\.\d+") echo "构建镜像:$repo" echo "构建架构:$arch"