Skip to content

Commit a1e9e69

Browse files
RaymondMouthaandceejay
authored andcommitted
Added support for s390x (#143) [skip travis]
* Added support for s390x - manifest list added
1 parent bd355ae commit a1e9e69

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

.docker/docker.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,13 @@ function docker_manifest_list_version() {
114114
${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-amd64 \
115115
${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm32v6 \
116116
${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm32v7 \
117-
${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm64v8
117+
${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm64v8 \
118+
${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-s390x
118119

119120
docker manifest annotate ${TARGET}:${BUILD_VERSION}${NODE_VERSION}${TAG_SUFFIX} ${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm32v6 --os=linux --arch=arm --variant=v6
120121
docker manifest annotate ${TARGET}:${BUILD_VERSION}${NODE_VERSION}${TAG_SUFFIX} ${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm32v7 --os=linux --arch=arm --variant=v7
121122
docker manifest annotate ${TARGET}:${BUILD_VERSION}${NODE_VERSION}${TAG_SUFFIX} ${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm64v8 --os=linux --arch=arm64 --variant=v8
123+
docker manifest annotate ${TARGET}:${BUILD_VERSION}${NODE_VERSION}${TAG_SUFFIX} ${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-s390x --os=linux --arch=s390x
122124

123125
docker manifest push ${TARGET}:${BUILD_VERSION}${NODE_VERSION}${TAG_SUFFIX}
124126

@@ -144,11 +146,13 @@ function docker_manifest_list_test_beta_latest() {
144146
${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-amd64 \
145147
${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm32v6 \
146148
${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm32v7 \
147-
${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm64v8
149+
${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm64v8 \
150+
${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-s390x
148151

149152
docker manifest annotate ${TARGET}:${TAG_PREFIX}${NODE_VERSION}${TAG_SUFFIX} ${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm32v6 --os=linux --arch=arm --variant=v6
150153
docker manifest annotate ${TARGET}:${TAG_PREFIX}${NODE_VERSION}${TAG_SUFFIX} ${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm32v7 --os=linux --arch=arm --variant=v7
151154
docker manifest annotate ${TARGET}:${TAG_PREFIX}${NODE_VERSION}${TAG_SUFFIX} ${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-arm64v8 --os=linux --arch=arm64 --variant=v8
155+
docker manifest annotate ${TARGET}:${TAG_PREFIX}${NODE_VERSION}${TAG_SUFFIX} ${TARGET}:${BUILD_VERSION}${NODE_VERSION:--10}${TAG_SUFFIX}-s390x --os=linux --arch=s390x
152156

153157
docker manifest push ${TARGET}:${TAG_PREFIX}${NODE_VERSION}${TAG_SUFFIX}
154158

@@ -191,6 +195,7 @@ function prepare_qemu() {
191195
curl -L -o qemu-x86_64-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/$QEMU_VERSION/qemu-x86_64-static.tar.gz && tar xzf qemu-x86_64-static.tar.gz &&
192196
curl -L -o qemu-arm-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/$QEMU_VERSION/qemu-arm-static.tar.gz && tar xzf qemu-arm-static.tar.gz &&
193197
curl -L -o qemu-aarch64-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/$QEMU_VERSION/qemu-aarch64-static.tar.gz && tar xzf qemu-aarch64-static.tar.gz &&
198+
curl -L -o qemu-s390x-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/$QEMU_VERSION/qemu-s390x-static.tar.gz && tar xzf qemu-s390x-static.tar.gz &&
194199
popd
195200
}
196201

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Created by .ignore support plugin (hsz.mobi)
2+
/node-red-docker.iml
3+
/.idea/

.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,29 @@ env:
2020
- NODE_VERSION=10 TAG_SUFFIX=default QEMU_ARCH=arm ARCH=arm32v6
2121
- NODE_VERSION=10 TAG_SUFFIX=default QEMU_ARCH=arm ARCH=arm32v7
2222
- NODE_VERSION=10 TAG_SUFFIX=default QEMU_ARCH=aarch64 ARCH=arm64v8
23+
- NODE_VERSION=10 TAG_SUFFIX=default QEMU_ARCH=s390x ARCH=s390x
2324

2425
# Minimal Images
2526
- NODE_VERSION=10 TAG_SUFFIX=minimal QEMU_ARCH=x86_64 ARCH=amd64
2627
- NODE_VERSION=10 TAG_SUFFIX=minimal QEMU_ARCH=arm ARCH=arm32v6
2728
- NODE_VERSION=10 TAG_SUFFIX=minimal QEMU_ARCH=arm ARCH=arm32v7
2829
- NODE_VERSION=10 TAG_SUFFIX=minimal QEMU_ARCH=aarch64 ARCH=arm64v8
30+
- NODE_VERSION=10 TAG_SUFFIX=minimal QEMU_ARCH=s390x ARCH=s390x
2931

3032
### Node JS 12 #####################################################################################################
3133
# Default Images
3234
- NODE_VERSION=12 TAG_SUFFIX=default QEMU_ARCH=x86_64 ARCH=amd64
3335
- NODE_VERSION=12 TAG_SUFFIX=default QEMU_ARCH=arm ARCH=arm32v6
3436
- NODE_VERSION=12 TAG_SUFFIX=default QEMU_ARCH=arm ARCH=arm32v7
3537
- NODE_VERSION=12 TAG_SUFFIX=default QEMU_ARCH=aarch64 ARCH=arm64v8
38+
- NODE_VERSION=12 TAG_SUFFIX=default QEMU_ARCH=s390x ARCH=s390x
3639

3740
# Minimal Images
3841
- NODE_VERSION=12 TAG_SUFFIX=minimal QEMU_ARCH=x86_64 ARCH=amd64
3942
- NODE_VERSION=12 TAG_SUFFIX=minimal QEMU_ARCH=arm ARCH=arm32v6
4043
- NODE_VERSION=12 TAG_SUFFIX=minimal QEMU_ARCH=arm ARCH=arm32v7
4144
- NODE_VERSION=12 TAG_SUFFIX=minimal QEMU_ARCH=aarch64 ARCH=arm64v8
45+
- NODE_VERSION=12 TAG_SUFFIX=minimal QEMU_ARCH=s390x ARCH=s390x
4246

4347
before_install:
4448
- ./.docker/docker.sh prepare

0 commit comments

Comments
 (0)