From 4e87394edf1bab53d984d0584d0f42ad42dc38eb Mon Sep 17 00:00:00 2001 From: NI Date: Thu, 21 Oct 2021 19:11:47 +0800 Subject: [PATCH] Use `ubuntu:rolling` as build base instead of `debian:testing` --- Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ed3bb00..cf10a67d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,15 @@ # Build the build base environment -FROM debian:testing AS base +FROM ubuntu:rolling AS base RUN set -ex && \ cd / && \ echo '#!/bin/sh' > /try.sh && echo 'res=0; for i in $(seq 0 36); do $@; res=$?; [ $res -eq 0 ] && exit $res || sleep 10; done; exit $res' >> /try.sh && chmod +x /try.sh && \ echo '#!/bin/sh' > /child.sh && echo 'cpid=""; ret=0; i=0; for c in "$@"; do ( (((((eval "$c"; echo $? >&3) | sed "s/^/|-($i) /" >&4) 2>&1 | sed "s/^/|-($i)!/" >&2) 3>&1) | (read xs; exit $xs)) 4>&1) & ppid=$!; cpid="$cpid $ppid"; echo "+ Child $i (PID $ppid): $c ..."; i=$((i+1)); done; for c in $cpid; do wait $c; cret=$?; [ $cret -eq 0 ] && continue; echo "* Child PID $c has failed." >&2; ret=$cret; done; exit $ret' >> /child.sh && chmod +x /child.sh && \ export PATH=$PATH:/ && \ + export DEBIAN_FRONTEND=noninteractive && \ ([ -z "$HTTP_PROXY" ] || (echo "Acquire::http::Proxy \"$HTTP_PROXY\";" >> /etc/apt/apt.conf)) && \ ([ -z "$HTTPS_PROXY" ] || (echo "Acquire::https::Proxy \"$HTTPS_PROXY\";" >> /etc/apt/apt.conf)) && \ (echo "Acquire::Retries \"8\";" >> /etc/apt/apt.conf) && \ - echo '#!/bin/sh' > /install.sh && echo 'apt-get update && apt-get install autoconf automake libtool build-essential ca-certificates curl git npm golang-go libvips libvips-dev -y' >> /install.sh && chmod +x /install.sh && \ + echo '#!/bin/sh' > /install.sh && echo 'apt-get update && apt-get --fix-broken install autoconf automake libtool build-essential ca-certificates curl git npm golang-go libvips libvips-dev -y' >> /install.sh && chmod +x /install.sh && \ /try.sh /install.sh && rm /install.sh && \ /try.sh update-ca-certificates -f && c_rehash && \ ([ -z "$HTTP_PROXY" ] || (git config --global http.proxy "$HTTP_PROXY" && npm config set proxy "$HTTP_PROXY")) && \ @@ -23,6 +24,7 @@ COPY . /tmp/.build/sshwifty RUN set -ex && \ cd / && \ export PATH=$PATH:/ && \ + export DEBIAN_FRONTEND=noninteractive && \ export CPPFLAGS='-DPNG_ARM_NEON_OPT=0' && \ /try.sh apt-get install libpng-dev -y && \ ls -l /tmp/.build/sshwifty && \ @@ -70,4 +72,4 @@ RUN set -ex && \ USER sshwifty EXPOSE 8182 ENTRYPOINT [ "/sshwifty.sh" ] -CMD [] \ No newline at end of file +CMD []