From 402292d75e4a8d583b76a349bb143b36856fcf4f Mon Sep 17 00:00:00 2001 From: KsmoinO <99479-KsmoinO@users.noreply.framagit.org> Date: Sun, 20 Nov 2022 13:00:57 +0100 Subject: [PATCH] HedgeDoc ci-build --- podman-hedgedoc/ci_build-images.sh | 4 ++-- podman-hedgedoc/vars.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/podman-hedgedoc/ci_build-images.sh b/podman-hedgedoc/ci_build-images.sh index dbce483..ace197b 100755 --- a/podman-hedgedoc/ci_build-images.sh +++ b/podman-hedgedoc/ci_build-images.sh @@ -11,10 +11,10 @@ buildfolder=/tmp/hedgedoc-$$ if ! podman image exists ${hedgedoc_image}:${hedgedoc_version}; then mkdir ${buildfolder} && - curl -sSfLo ${buildfolder}/Dockerfile -- "https://github.com/hedgedoc/container/raw/master/alpine/Dockerfile" ${buildfolder}/ && { + git clone --depth=1 https://github.com/hedgedoc/container ${buildfolder}/ && { #sed_in_place "^FROM golang" "FROM docker.io/library/golang" ${buildfolder}/Dockerfile #sed_in_place "^FROM alpine" "FROM docker.io/library/alpine" ${buildfolder}/Dockerfile - TMPDIR=${HOME} podman image build -t ${hedgedoc_image}:${hedgedoc_version} -f ${buildfolder}/Dockerfile ${buildfolder} + TMPDIR=${HOME} podman image build -t ${hedgedoc_image}:${hedgedoc_version} --build-arg VERSION=${hedgedoc_version/%-alpine/} -f ${buildfolder}/alpine/Dockerfile ${buildfolder} } rm -rf ${buildfolder} podman image prune -a -f --filter dangling=true diff --git a/podman-hedgedoc/vars.sh b/podman-hedgedoc/vars.sh index 1e51a02..a4032f3 100644 --- a/podman-hedgedoc/vars.sh +++ b/podman-hedgedoc/vars.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash ## vars hedgedoc_image="quay.io/hedgedoc/hedgedoc" +#hedgedoc_image="git.garbaye.fr/garbaye/hedgedoc" hedgedoc_version='1.9.6-alpine' database_image="docker.io/library/postgres" database_version='14.5-alpine'