[TEMPORARY] cherry-pick of part of 930da14 from branch: eb/feature/docker-build-for-GCC11+

Author: adamretter

Makefile

@@ -2362,7 +2362,7 @@ rocksdbjavastaticdockerarm64v8: rocksdbjavanativedir
 	docker run --rm --name rocksdb_linux_arm64v8-be --platform linux/aarch64 --attach stdin --attach stdout --attach stderr --volume $(HOME)/.m2:/root/.m2 --volume `pwd`:/rocksdb-host:ro --volume /rocksdb-local-build --volume `pwd`/$(JAVA_NATIVE_DIR):/rocksdb-java-target --env DEBUG_LEVEL=$(DEBUG_LEVEL) --env J=$(J) evolvedbinary/rocksjava:centos7_arm64v8-be /rocksdb-host/java/crossbuild/docker-build-linux.sh
 
 rocksdbjavastaticdockers390x: rocksdbjavanativedir
-	docker run --rm --name rocksdb_linux_s390x-be --platform linux/s390x --attach stdin --attach stdout --attach stderr --volume $(HOME)/.m2:/root/.m2 --volume `pwd`:/rocksdb-host:ro --volume /rocksdb-local-build --volume `pwd`/$(JAVA_NATIVE_DIR):/rocksdb-java-target --env DEBUG_LEVEL=$(DEBUG_LEVEL) --env J=$(J) evolvedbinary/rocksjava:ubuntu18_s390x-be /rocksdb-host/java/crossbuild/docker-build-linux.sh
+	docker run --rm --name rocksdb_linux_s390x-be --platform linux/s390x --attach stdin --attach stdout --attach stderr --volume $(HOME)/.m2:/root/.m2 --volume `pwd`:/rocksdb-host:ro --volume /rocksdb-local-build --volume `pwd`/$(JAVA_NATIVE_DIR):/rocksdb-java-target --env DEBUG_LEVEL=$(DEBUG_LEVEL) --env J=$(J) evolvedbinary/rocksjava:centos7_s390x-be /rocksdb-host/java/crossbuild/docker-build-linux.sh
 
 rocksdbjavastaticdockerriscv64: rocksdbjavanativedir
 	docker run --rm --name rocksdb_linux_riscv64-be --platform linux/riscv64 --attach stdin --attach stdout --attach stderr --volume $(HOME)/.m2:/root/.m2 --volume `pwd`:/rocksdb-host:ro --volume /rocksdb-local-build --volume `pwd`/$(JAVA_NATIVE_DIR):/rocksdb-java-target --env DEBUG_LEVEL=$(DEBUG_LEVEL) --env J=$(J) evolvedbinary/rocksjava:ubuntu20_riscv64-be /rocksdb-host/java/crossbuild/docker-build-linux.sh