From c34d30fb49679a5bca90d2d3d37a6ce1dd6116e9 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Fri, 13 Jan 2017 20:31:57 +1100 Subject: [PATCH] *: rework update and generation scripts This is necessary in order to have proper generation of variant and version-based Dockerfiles from a single template. Signed-off-by: Aleksa Sarai --- generate-stackbrew-library.sh | 83 +++++++++++++++++++++++++++++++---- update.sh | 47 ++++++++++++++------ 2 files changed, 108 insertions(+), 22 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index bf54f977..e85a34ae 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,16 +1,81 @@ #!/bin/bash set -e +self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" -url='git://github.com/nextcloud/docker' +# Get the most recent commit which modified any of "$@". +fileCommit() { + git log -1 --format='format:%H' HEAD -- "$@" +} -commit="$(git log -1 --format='format:%H' -- Dockerfile $(awk 'toupper($1) == "COPY" { for (i = 2; i < NF; i++) { print $i } }' Dockerfile))" -fullVersion="$(grep -m1 'ENV NEXTCLOUD_VERSION ' ./Dockerfile | cut -d' ' -f3)" +# Get the most recent commit which modified "$1/Dockerfile" or any file that +# the Dockerfile copies into the rootfs (with COPY). +dockerfileCommit() { + local dir="$1"; shift + ( + cd "$dir"; + fileCommit Dockerfile \ + $(git show HEAD:./Dockerfile | awk ' + toupper($1) == "COPY" { + for (i = 2; i < NF; i++) + print $i; + } + ') + ) +} -echo '# maintainer: docker@nextcloud.com' -echo -echo "$fullVersion: ${url}@${commit}" -echo "${fullVersion%.*}: ${url}@${commit}" -echo "${fullVersion%.*.*}: ${url}@${commit}" -echo "latest: ${url}@${commit}" +# Header. +cat <<-EOH +# This file is generated via https://github.com/nextcloud/docker/blob/$(fileCommit "$self")/$self + +Maintainers: Nextcloud (@nextcloud), + Pierre Ozoux (@pierreozoux) +GitRepo: https://github.com/nextcloud/docker.git +EOH + +# prints "$2$1$3$1...$N" +join() { + local sep="$1"; shift + local out; printf -v out "${sep//%/%%}%s" "$@" + echo "${out#$sep}" +} + +latest=$(curl -sSL 'https://nextcloud.com/changelog/' |tac|tac \ + | grep -o "\(Version\|Release\)\s\+[[:digit:]]\+\(.[[:digit:]]\+\)\+" \ + | awk '{ print $2 }' \ + | sort -uV \ + | tail -1) + +# Generate each of the tags. +versions=( */ ) +versions=( "${versions[@]%/}" ) +for version in "${versions[@]}"; do + variants=( $version/*/ ) + variants=( $(for variant in "${variants[@]%/}"; do + echo "$(basename "$variant")" + done) ) + for variant in "${variants[@]}"; do + commit="$(dockerfileCommit "$version/$variant")" + fullversion="$(git show "$commit":"$version/$variant/Dockerfile" | awk '$1 == "ENV" && $2 == "NEXTCLOUD_VERSION" { print $3; exit }')" + + versionAliases=( "$fullversion" "${fullversion%.*}" "${fullversion%.*.*}" ) + if [ "$fullversion" = "$latest" ]; then + versionAliases+=( "latest" ) + fi + + variantAliases=( "${versionAliases[@]/%/-$variant}" ) + variantAliases=( "${variantAliases[@]//latest-}" ) + + if [ "$variant" = "apache" ]; then + variantAliases+=( "${versionAliases[@]}" ) + fi + + cat <<-EOE + + Tags: $(join ', ' "${variantAliases[@]}") + GitCommit: $commit + Directory: $version/$variant + EOE + done +done diff --git a/update.sh b/update.sh index e5d0424b..583aab0c 100755 --- a/update.sh +++ b/update.sh @@ -1,17 +1,38 @@ #!/bin/bash set -eo pipefail -current="$( - git ls-remote --tags https://github.com/nextcloud/server.git \ - | awk -F 'refs/tags/' ' - $2 ~ /^v?[0-9]/ { - gsub(/^v|\^.*/, "", $2); - print $2; - } - ' \ - | sort -uV \ - | tail -1 -)" +declare -A cmd=( + [apache]='apache2-foreground' + [fpm]='php-fpm' +) -set -x -sed -ri 's/^(ENV NEXTCLOUD_VERSION) .*/\1 '"$current"'/;' ./Dockerfile +latests=( $(curl -sSL 'https://nextcloud.com/changelog/' |tac|tac| \ + grep -o "\(Version\|Release\)\s\+[[:digit:]]\+\(\.[[:digit:]]\+\)\+" | \ + awk '{ print $2 }' | sort -V ) ) + +for latest in "${latests[@]}"; do + version=$(echo "$latest" | cut -d. -f1-2) + + for variant in apache fpm; do + # Create the version+variant directory with a Dockerfile. + mkdir -p "$version/$variant" + cp Dockerfile.template "$version/$variant/Dockerfile" + + echo "updating $latest [$version] $variant" + + # Replace the variables. + sed -ri -e ' + s/%%VARIANT%%/'"$variant"'/g; + s/%%VERSION%%/'"$latest"'/g; + s/%%CMD%%/'"${cmd[$variant]}"'/g; + ' "$version/$variant/Dockerfile" + + # Remove Apache commands if we're not an Apache variant. + if [ "$variant" != "apache" ]; then + sed -ri -e '/a2enmod/d' "$version/$variant/Dockerfile" + fi + + # Copy the docker-entrypoint. + cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh" + done +done