aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@alpinelinux.org>2020-01-02 23:25:40 +0100
committerCarlo Landmeter <clandmeter@alpinelinux.org>2020-01-02 23:25:40 +0100
commit0c6fb46d7b2230dda10d4b8ec6392876fb7e6ae8 (patch)
tree0633afab788fb8016a05b6f18de5b672baa121a5
parent6e2e6a984162c43d92e480fb3b0f74c1318a0901 (diff)
downloaddocker-abuild-0c6fb46d7b2230dda10d4b8ec6392876fb7e6ae8.tar.bz2
docker-abuild-0c6fb46d7b2230dda10d4b8ec6392876fb7e6ae8.tar.xz
fix project and release name
-rwxr-xr-xmake_images.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/make_images.sh b/make_images.sh
index 1d2be49..4fe9212 100755
--- a/make_images.sh
+++ b/make_images.sh
@@ -3,7 +3,7 @@
set -eu
readonly NAMESPACE="${NAMESPACE:=alpinelinux}"
-readonly PROJECT="${PROJECT:=docker-alpine}"
+readonly PROJECT="${PROJECT:=docker-abuild}"
readonly ARCHES="${ARCHES:=x86 x86_64 armhf armv7 aarch64 ppc64le s390x}"
readonly TEMPLATE="Dockerfile.in"
@@ -34,8 +34,8 @@ build() {
sed -e "s/%%ALPINE_IMG%%/$(arch_to_image $arch)/" \
-e "s/%%ALPINE_TAG%%/${RELEASE/v/}/" \
-e "s/%%ALPINE_REL%%/$RELEASE/" "$TEMPLATE" > Dockerfile
- docker build --no-cache -t "$NAMESPACE/$PROJECT:$RELEASE-$arch" . || \
- die "Failed to build docker-abuild:$RELEASE-$arch"
+ docker build --no-cache -t "$NAMESPACE/$PROJECT:${RELEASE/v/}-$arch" . || \
+ die "Failed to build docker-abuild:${RELEASE/v/}-$arch"
done
}
@@ -45,8 +45,8 @@ push() {
for arch in $ARCHES; do
[ "$RELEASE" = "v3.8" ] && [ "$arch" = "armv7" ] && continue
- docker push "$NAMESPACE/$PROJECT:$RELEASE-$arch" || \
- die "Failed to push docker-abuild:$RELEASE-$arch"
+ docker push "$NAMESPACE/$PROJECT:${RELEASE/v/}-$arch" || \
+ die "Failed to push docker-abuild:${RELEASE/v/}-$arch"
done
}
@@ -58,7 +58,7 @@ manifest() {
for arch in $ARCHES; do
[ "$RELEASE" = "v3.8" ] && [ "$arch" = "armv7" ] && continue
- images="$images $NAMESPACE/$PROJECT:$RELEASE-$arch"
+ images="$images $NAMESPACE/$PROJECT:${RELEASE/v/}-$arch"
done
docker manifest create --amend "$NAMESPACE/$PROJECT" $images || \