diff --git a/podman-seafile/ci_build-images.sh b/podman-seafile/ci_build-images.sh index 1a0c131..e3007da 100755 --- a/podman-seafile/ci_build-images.sh +++ b/podman-seafile/ci_build-images.sh @@ -12,7 +12,7 @@ buildfolder=/tmp/seafile-$$ if ! podman image exists ${seafile_image}:${seafile_release}; then mkdir ${buildfolder} && git clone --depth=1 https://github.com/haiwen/seafile-docker.git ${buildfolder}/ && - sed_in_place "^FROM phusion/baseimage:focal-1.2.0" "FROM docker.io/phusion/baseimage:focal-1.2.0" ${buildfolder}/image/seafile_${seafile_release%.*}/Dockerfile && + sed_in_place "^FROM phusion" "FROM docker.io/phusion" ${buildfolder}/image/seafile_${seafile_release%.*}/Dockerfile && sed_in_place "SEAFILE_VERSION=" "SEAFILE_VERSION=${seafile_release}" ${buildfolder}/image/seafile_${seafile_release%.*}/Dockerfile && sed_in_place "pip -i https://pypi.tuna.tsinghua.edu.cn/simple/" "pip" ${buildfolder}/image/seafile_${seafile_release%.*}/Dockerfile && sed_in_place " -i https://pypi.tuna.tsinghua.edu.cn/simple/" " " ${buildfolder}/image/seafile_${seafile_release%.*}/Dockerfile && @@ -21,7 +21,7 @@ if ! podman image exists ${seafile_image}:${seafile_release}; then podman build -t ${seafile_image}:${seafile_release} \ -f ${buildfolder}/image/seafile_${seafile_release%.*}/Dockerfile \ ${buildfolder} && - podman rmi phusion/baseimage:focal-1.2.0 + podman rmi -f $(podman images -a -q -- phusion/baseimage) rm -rf ${buildfolder} else echo "Image ${seafile_image}:${seafile_release} already built"