[build]: Adjust arm63v6 and aarch64 images to match convention (#2845)
* Adjust arm32v6 and aarch64 docker images to match the hello-world image * Update from master, fix potential bug in push-images target, and update storagenode deploy to handle arm64 image
This commit is contained in:
parent
8c24399438
commit
1b2a2d045f
9
Makefile
9
Makefile
@ -286,10 +286,15 @@ push-images: ## Push Docker images to Docker Hub (jenkins)
|
|||||||
for c in bootstrap gateway satellite storagenode uplink versioncontrol ; do \
|
for c in bootstrap gateway satellite storagenode uplink versioncontrol ; do \
|
||||||
docker push storjlabs/$$c:${TAG}${CUSTOMTAG}-amd64 \
|
docker push storjlabs/$$c:${TAG}${CUSTOMTAG}-amd64 \
|
||||||
&& docker push storjlabs/$$c:${TAG}${CUSTOMTAG}-arm32v6 \
|
&& docker push storjlabs/$$c:${TAG}${CUSTOMTAG}-arm32v6 \
|
||||||
|
&& docker push storjlabs/$$c:${TAG}${CUSTOMTAG}-aarch64 \
|
||||||
&& for t in ${TAG}${CUSTOMTAG} ${LATEST_TAG}; do \
|
&& for t in ${TAG}${CUSTOMTAG} ${LATEST_TAG}; do \
|
||||||
docker manifest create storjlabs/$$c:$$t storjlabs/$$c:${TAG}${CUSTOMTAG}-amd64 storjlabs/$$c:${TAG}${CUSTOMTAG}-arm32v6 \
|
docker manifest create storjlabs/$$c:$$t \
|
||||||
|
storjlabs/$$c:${TAG}${CUSTOMTAG}-amd64 \
|
||||||
|
storjlabs/$$c:${TAG}${CUSTOMTAG}-arm32v6 \
|
||||||
|
storjlabs/$$c:${TAG}${CUSTOMTAG}-aarch64 \
|
||||||
&& docker manifest annotate storjlabs/$$c:$$t storjlabs/$$c:${TAG}${CUSTOMTAG}-amd64 --os linux --arch amd64 \
|
&& docker manifest annotate storjlabs/$$c:$$t storjlabs/$$c:${TAG}${CUSTOMTAG}-amd64 --os linux --arch amd64 \
|
||||||
&& docker manifest annotate storjlabs/$$c:$$t storjlabs/$$c:${TAG}${CUSTOMTAG}-arm32v6 --os linux --arch arm --variant arm32v6 \
|
&& docker manifest annotate storjlabs/$$c:$$t storjlabs/$$c:${TAG}${CUSTOMTAG}-arm32v6 --os linux --arch arm --variant v6 \
|
||||||
|
&& docker manifest annotate storjlabs/$$c:$$t storjlabs/$$c:${TAG}${CUSTOMTAG}-aarch64 --os linux --arch arm64 \
|
||||||
&& docker manifest push --purge storjlabs/$$c:$$t \
|
&& docker manifest push --purge storjlabs/$$c:$$t \
|
||||||
; done \
|
; done \
|
||||||
; done
|
; done
|
||||||
|
8
scripts/deploy-storagenode.sh
Normal file → Executable file
8
scripts/deploy-storagenode.sh
Normal file → Executable file
@ -8,13 +8,17 @@ set -euo pipefail
|
|||||||
for v in alpha arm beta; do
|
for v in alpha arm beta; do
|
||||||
docker manifest create storjlabs/storagenode:$v \
|
docker manifest create storjlabs/storagenode:$v \
|
||||||
storjlabs/storagenode:${TAG}-amd64 \
|
storjlabs/storagenode:${TAG}-amd64 \
|
||||||
storjlabs/storagenode:${TAG}-arm32v6
|
storjlabs/storagenode:${TAG}-arm32v6 \
|
||||||
|
storjlabs/storagenode:${TAG}-aarch64
|
||||||
|
|
||||||
docker manifest annotate storjlabs/storagenode:$v \
|
docker manifest annotate storjlabs/storagenode:$v \
|
||||||
storjlabs/storagenode:${TAG}-amd64 --os linux --arch amd64
|
storjlabs/storagenode:${TAG}-amd64 --os linux --arch amd64
|
||||||
|
|
||||||
docker manifest annotate storjlabs/storagenode:$v \
|
docker manifest annotate storjlabs/storagenode:$v \
|
||||||
storjlabs/storagenode:${TAG}-arm32v6 --os linux --arch arm --variant arm32v6
|
storjlabs/storagenode:${TAG}-arm32v6 --os linux --arch arm --variant v6
|
||||||
|
|
||||||
|
docker manifest annotate storjlabs/storagenode:$v \
|
||||||
|
storjlabs/storagenode:${TAG}-aarch64 --os linux --arch arm64
|
||||||
|
|
||||||
docker manifest push --purge storjlabs/storagenode:$v
|
docker manifest push --purge storjlabs/storagenode:$v
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user