diff --git a/podman-seafile/ci_build-images.sh b/podman-seafile/ci_build-images.sh index 840d3a3..bb91e95 100755 --- a/podman-seafile/ci_build-images.sh +++ b/podman-seafile/ci_build-images.sh @@ -12,12 +12,12 @@ 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.0.0" "FROM docker.io/phusion/baseimage:focal-1.0.0" ${buildfolder}/image/seafile_9.0/Dockerfile && - sed_in_place "SEAFILE_VERSION=" "SEAFILE_VERSION=${seafile_release}" ${buildfolder}/image/seafile_9.0/Dockerfile && - mv ${buildfolder}/scripts_9.0 ${buildfolder}/image/seafile_9.0/ && + sed_in_place "^FROM phusion/baseimage:focal-1.0.0" "FROM docker.io/phusion/baseimage:focal-1.0.0" ${buildfolder}/image/seafile_${seafile_release%.*}/Dockerfile && + sed_in_place "SEAFILE_VERSION=" "SEAFILE_VERSION=${seafile_release}" ${buildfolder}/image/seafile_${seafile_release%.*}/Dockerfile && + mv ${buildfolder}/scripts_${seafile_release%.*} ${buildfolder}/image/seafile_${seafile_release%.*}/ && podman build -t ${seafile_image}:${seafile_release} \ - -f ${buildfolder}/image/seafile_9.0/Dockerfile \ - ${buildfolder}/image/seafile_9.0 && + -f ${buildfolder}/image/seafile_${seafile_release%.*}/Dockerfile \ + ${buildfolder}/image/seafile_${seafile_release%.*} && podman rmi phusion/baseimage:focal-1.0.0 rm -rf ${buildfolder} else