From 0d620afb717804bb2e6f07bcc84a471f51e84d19 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Sat, 6 Apr 2019 23:16:46 +0000 Subject: scripts: use only a single copy --- dockerfiles/edge/aarch64/Dockerfile | 3 +- dockerfiles/edge/armhf/Dockerfile | 3 +- dockerfiles/edge/armv7/Dockerfile | 3 +- dockerfiles/edge/x86/Dockerfile | 3 +- dockerfiles/edge/x86_64/Dockerfile | 3 +- dockerfiles/v3.9/aarch64/Dockerfile | 3 +- dockerfiles/v3.9/armhf/Dockerfile | 3 +- dockerfiles/v3.9/armv7/Dockerfile | 3 +- dockerfiles/v3.9/x86/Dockerfile | 3 +- dockerfiles/v3.9/x86_64/Dockerfile | 3 +- files/usr/local/bin/build.sh | 122 ++++++++++++++++++++++++++++++++++++ files/usr/local/bin/setup.sh | 18 ++++++ scripts/build.sh | 122 ------------------------------------ scripts/setup.sh | 18 ------ 14 files changed, 150 insertions(+), 160 deletions(-) create mode 100755 files/usr/local/bin/build.sh create mode 100755 files/usr/local/bin/setup.sh delete mode 100755 scripts/build.sh delete mode 100755 scripts/setup.sh diff --git a/dockerfiles/edge/aarch64/Dockerfile b/dockerfiles/edge/aarch64/Dockerfile index 9c0cbb1..8358f98 100644 --- a/dockerfiles/edge/aarch64/Dockerfile +++ b/dockerfiles/edge/aarch64/Dockerfile @@ -1,7 +1,6 @@ FROM arm64v8/alpine:latest -COPY scripts/*.sh /usr/local/bin/ -COPY files/etc/ /etc/ +COPY files/ / RUN ["setup.sh", "edge" ] diff --git a/dockerfiles/edge/armhf/Dockerfile b/dockerfiles/edge/armhf/Dockerfile index c52f5e5..af7fba5 100644 --- a/dockerfiles/edge/armhf/Dockerfile +++ b/dockerfiles/edge/armhf/Dockerfile @@ -1,7 +1,6 @@ FROM arm32v6/alpine:latest -COPY scripts/*.sh /usr/local/bin/ -COPY files/etc/ /etc/ +COPY files/ / RUN ["setup.sh", "edge" ] diff --git a/dockerfiles/edge/armv7/Dockerfile b/dockerfiles/edge/armv7/Dockerfile index 29bc2fa..101f48d 100644 --- a/dockerfiles/edge/armv7/Dockerfile +++ b/dockerfiles/edge/armv7/Dockerfile @@ -1,7 +1,6 @@ FROM arm32v6/alpine:latest -COPY scripts/*.sh /usr/local/bin/ -COPY files/etc/ /etc/ +COPY files/ / # hack to force system to upgrade to armv7 COPY dockerfiles/edge/armv7/arch /etc/apk/ diff --git a/dockerfiles/edge/x86/Dockerfile b/dockerfiles/edge/x86/Dockerfile index 6d74529..c944be5 100644 --- a/dockerfiles/edge/x86/Dockerfile +++ b/dockerfiles/edge/x86/Dockerfile @@ -1,7 +1,6 @@ FROM i386/alpine:latest -COPY scripts/*.sh /usr/local/bin/ -COPY files/etc/ /etc/ +COPY files/ / RUN ["setup.sh", "edge" ] diff --git a/dockerfiles/edge/x86_64/Dockerfile b/dockerfiles/edge/x86_64/Dockerfile index 2f7fbd6..eafb80b 100644 --- a/dockerfiles/edge/x86_64/Dockerfile +++ b/dockerfiles/edge/x86_64/Dockerfile @@ -1,7 +1,6 @@ FROM amd64/alpine:latest -COPY scripts/*.sh /usr/local/bin/ -COPY files/etc/ /etc/ +COPY files/ / RUN ["setup.sh", "edge" ] diff --git a/dockerfiles/v3.9/aarch64/Dockerfile b/dockerfiles/v3.9/aarch64/Dockerfile index 104717c..82c4354 100644 --- a/dockerfiles/v3.9/aarch64/Dockerfile +++ b/dockerfiles/v3.9/aarch64/Dockerfile @@ -1,7 +1,6 @@ FROM arm64v8/alpine:3.9 -COPY scripts/*.sh /usr/local/bin/ -COPY files/etc/ /etc/ +COPY files/ / RUN ["setup.sh", "v3.9" ] diff --git a/dockerfiles/v3.9/armhf/Dockerfile b/dockerfiles/v3.9/armhf/Dockerfile index a2f6165..2e8259c 100644 --- a/dockerfiles/v3.9/armhf/Dockerfile +++ b/dockerfiles/v3.9/armhf/Dockerfile @@ -1,7 +1,6 @@ FROM arm32v6/alpine:3.9 -COPY scripts/*.sh /usr/local/bin/ -COPY files/etc/ /etc/ +COPY files/ / RUN ["setup.sh", "v3.9" ] diff --git a/dockerfiles/v3.9/armv7/Dockerfile b/dockerfiles/v3.9/armv7/Dockerfile index 394f9a4..7f523ed 100644 --- a/dockerfiles/v3.9/armv7/Dockerfile +++ b/dockerfiles/v3.9/armv7/Dockerfile @@ -1,7 +1,6 @@ FROM arm32v6/alpine:3.9 -COPY scripts/*.sh /usr/local/bin/ -COPY files/etc/ /etc/ +COPY files/ / # hack to force system to upgrade to armv7 COPY dockerfiles/v3.9/armv7/arch /etc/apk/ diff --git a/dockerfiles/v3.9/x86/Dockerfile b/dockerfiles/v3.9/x86/Dockerfile index 7fd95ec..f545247 100644 --- a/dockerfiles/v3.9/x86/Dockerfile +++ b/dockerfiles/v3.9/x86/Dockerfile @@ -1,7 +1,6 @@ FROM i386/alpine:3.9 -COPY scripts/*.sh /usr/local/bin/ -COPY files/etc/ /etc/ +COPY files/ / RUN ["setup.sh", "v3.9" ] diff --git a/dockerfiles/v3.9/x86_64/Dockerfile b/dockerfiles/v3.9/x86_64/Dockerfile index 0ce65a5..bdabbfe 100644 --- a/dockerfiles/v3.9/x86_64/Dockerfile +++ b/dockerfiles/v3.9/x86_64/Dockerfile @@ -1,7 +1,6 @@ FROM amd64/alpine:3.9 -COPY scripts/*.sh /usr/local/bin/ -COPY files/etc/ /etc/ +OPY files/ / RUN ["setup.sh", "v3.9" ] diff --git a/files/usr/local/bin/build.sh b/files/usr/local/bin/build.sh new file mode 100755 index 0000000..8b5ad67 --- /dev/null +++ b/files/usr/local/bin/build.sh @@ -0,0 +1,122 @@ +#!/bin/sh + +set -eu + +readonly APORTSDIR=$HOME/aports +readonly REPODEST=$HOME/packages +readonly REPOS="main community testing" +readonly MIRROR=http://dl-cdn.alpinelinux.org/alpine +readonly REPOURL=https://github.com/alpinelinux/aports + +msg() { + local color=${2:-green} + case "$color" in + red) color="31";; + green) color="32";; + yellow) color="33";; + blue) color="34";; + *) color="32";; + esac + printf "\033[1;%sm>>>\033[1;0m %s\n" "$color" "$1" | xargs >&2 +} + +die() { + msg "$1" red + exit 1 +} + +get_release() { + local branch=$DRONE_COMMIT_BRANCH + case $branch in + *-stable) echo v${branch%-*};; + master) echo edge;; + *) die "Branch \"$branch\" not supported!" + esac +} + +build_aport() { + local repo="$1" aport="$2" + cd "$APORTSDIR/$repo/$aport" + abuild -r +} + +changed_repos() { + cd "$APORTSDIR" + for repo in $REPOS; do + git diff --exit-code remotes/origin/$DRONE_COMMIT_BRANCH -- $repo >/dev/null \ + || echo "$repo" + done +} + +set_repositories_for() { + local target_repo="$1" repos= repo= + local release=$(get_release) + for repo in $REPOS; do + repos="$repos $MIRROR/$release/$repo" + [ "$repo" = "$target_repo" ] && break + done + sudo sh -c "printf '%s\n' $repos > /etc/apk/repositories" + sudo apk update +} + +changed_aports() { + cd "$APORTSDIR" + local repo="$1" + local aports=$(git diff --name-only --diff-filter=ACMR --relative="$repo" \ + remotes/origin/$DRONE_COMMIT_BRANCH -- "*/APKBUILD" | xargs -I% dirname %) + ap builddirs -d "$APORTSDIR/$repo" $aports 2>/dev/null | xargs -I% basename % | xargs +} + +setup_system() { + sudo sh -c "echo $MIRROR/$(get_release)/main > /etc/apk/repositories" + sudo apk -U upgrade -a || apk fix || die "Failed to up/downgrade system" + abuild-keygen -ain + sudo sed -i 's/JOBS=[0-9]*/JOBS=$(nproc)/' /etc/abuild.conf + mkdir -p "$REPODEST" +} + +create_workspace() { + msg "Cloning aports and applying PR$DRONE_PULL_REQUEST" + git clone --depth=1 --branch $DRONE_COMMIT_BRANCH $REPOURL $APORTSDIR + wget -qO- $REPOURL/pull/$DRONE_PULL_REQUEST.patch | git -C $APORTSDIR am +} + + +sysinfo() { + printf ">>> Host system information (arch: %s, release: %s) <<<\n" "$(apk --print-arch)" "$(get_release)" + printf "- Number of Cores: %s\n" $(nproc) + printf "- Memory: %s Gb\n" $(awk '/^MemTotal/ {print ($2/1024/1024)}' /proc/meminfo) + printf "- Free space: %s\n" $(df -hP / | awk '/\/$/ {print $4}') +} + +aport_ok= +aport_ng= + +sysinfo || true +setup_system || die "Failed to setup system" +create_workspace || die "Failed to create workspace" + +for repo in $(changed_repos); do + set_repositories_for "$repo" + for pkgname in $(changed_aports "$repo"); do + if build_aport "$repo" "$pkgname"; then + checkapk || true + aport_ok="$aport_ok $repo/$pkgname" + else + aport_ng="$aport_ng $repo/$pkgname" + fi + done +done + +echo "### Build summary ###" + +for ok in $aport_ok; do + msg "$ok: build succesfully" +done + +if [ -n "$aport_ng" ]; then + die "Failed to build packages:$aport_ng" +elif [ -z "$aport_ok" ]; then + msg "No packages found to be built." yellow +fi + diff --git a/files/usr/local/bin/setup.sh b/files/usr/local/bin/setup.sh new file mode 100755 index 0000000..9e80a82 --- /dev/null +++ b/files/usr/local/bin/setup.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +set -eu + +release=${1:-edge} +echo "http://dl-cdn.alpinelinux.org/alpine/$release/main" > /etc/apk/repositories + +apk -U upgrade -a +apk add alpine-sdk lua-aports pigz +rm -rf /var/cache/apk/* + +# use buildozer for building +adduser -D buildozer +adduser buildozer abuild +adduser buildozer wheel + +# default distfiles location +install -d -g abuild -m 775 /var/cache/distfiles diff --git a/scripts/build.sh b/scripts/build.sh deleted file mode 100755 index 8b5ad67..0000000 --- a/scripts/build.sh +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh - -set -eu - -readonly APORTSDIR=$HOME/aports -readonly REPODEST=$HOME/packages -readonly REPOS="main community testing" -readonly MIRROR=http://dl-cdn.alpinelinux.org/alpine -readonly REPOURL=https://github.com/alpinelinux/aports - -msg() { - local color=${2:-green} - case "$color" in - red) color="31";; - green) color="32";; - yellow) color="33";; - blue) color="34";; - *) color="32";; - esac - printf "\033[1;%sm>>>\033[1;0m %s\n" "$color" "$1" | xargs >&2 -} - -die() { - msg "$1" red - exit 1 -} - -get_release() { - local branch=$DRONE_COMMIT_BRANCH - case $branch in - *-stable) echo v${branch%-*};; - master) echo edge;; - *) die "Branch \"$branch\" not supported!" - esac -} - -build_aport() { - local repo="$1" aport="$2" - cd "$APORTSDIR/$repo/$aport" - abuild -r -} - -changed_repos() { - cd "$APORTSDIR" - for repo in $REPOS; do - git diff --exit-code remotes/origin/$DRONE_COMMIT_BRANCH -- $repo >/dev/null \ - || echo "$repo" - done -} - -set_repositories_for() { - local target_repo="$1" repos= repo= - local release=$(get_release) - for repo in $REPOS; do - repos="$repos $MIRROR/$release/$repo" - [ "$repo" = "$target_repo" ] && break - done - sudo sh -c "printf '%s\n' $repos > /etc/apk/repositories" - sudo apk update -} - -changed_aports() { - cd "$APORTSDIR" - local repo="$1" - local aports=$(git diff --name-only --diff-filter=ACMR --relative="$repo" \ - remotes/origin/$DRONE_COMMIT_BRANCH -- "*/APKBUILD" | xargs -I% dirname %) - ap builddirs -d "$APORTSDIR/$repo" $aports 2>/dev/null | xargs -I% basename % | xargs -} - -setup_system() { - sudo sh -c "echo $MIRROR/$(get_release)/main > /etc/apk/repositories" - sudo apk -U upgrade -a || apk fix || die "Failed to up/downgrade system" - abuild-keygen -ain - sudo sed -i 's/JOBS=[0-9]*/JOBS=$(nproc)/' /etc/abuild.conf - mkdir -p "$REPODEST" -} - -create_workspace() { - msg "Cloning aports and applying PR$DRONE_PULL_REQUEST" - git clone --depth=1 --branch $DRONE_COMMIT_BRANCH $REPOURL $APORTSDIR - wget -qO- $REPOURL/pull/$DRONE_PULL_REQUEST.patch | git -C $APORTSDIR am -} - - -sysinfo() { - printf ">>> Host system information (arch: %s, release: %s) <<<\n" "$(apk --print-arch)" "$(get_release)" - printf "- Number of Cores: %s\n" $(nproc) - printf "- Memory: %s Gb\n" $(awk '/^MemTotal/ {print ($2/1024/1024)}' /proc/meminfo) - printf "- Free space: %s\n" $(df -hP / | awk '/\/$/ {print $4}') -} - -aport_ok= -aport_ng= - -sysinfo || true -setup_system || die "Failed to setup system" -create_workspace || die "Failed to create workspace" - -for repo in $(changed_repos); do - set_repositories_for "$repo" - for pkgname in $(changed_aports "$repo"); do - if build_aport "$repo" "$pkgname"; then - checkapk || true - aport_ok="$aport_ok $repo/$pkgname" - else - aport_ng="$aport_ng $repo/$pkgname" - fi - done -done - -echo "### Build summary ###" - -for ok in $aport_ok; do - msg "$ok: build succesfully" -done - -if [ -n "$aport_ng" ]; then - die "Failed to build packages:$aport_ng" -elif [ -z "$aport_ok" ]; then - msg "No packages found to be built." yellow -fi - diff --git a/scripts/setup.sh b/scripts/setup.sh deleted file mode 100755 index 9e80a82..0000000 --- a/scripts/setup.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -eu - -release=${1:-edge} -echo "http://dl-cdn.alpinelinux.org/alpine/$release/main" > /etc/apk/repositories - -apk -U upgrade -a -apk add alpine-sdk lua-aports pigz -rm -rf /var/cache/apk/* - -# use buildozer for building -adduser -D buildozer -adduser buildozer abuild -adduser buildozer wheel - -# default distfiles location -install -d -g abuild -m 775 /var/cache/distfiles -- cgit v1.2.3