Skip to content

  Add s390x Support for Cloudstack Simulator #12337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
viddya673 wants to merge 2 commits into
base: main
Choose a base branch
from
+90 −0
Open

  Add s390x Support for Cloudstack Simulator #12337

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89054ea
Adding s390x dockerfile support for cloudstack simulator
viddya673 Dec 23, 2025
8893ace
Merge branch 'apache:main' into s390x_cloudstack_simulator_support
viddya673 Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 90 additions & 0 deletions tools/docker/Dockerfile.s390x
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
# CloudStack-simulator build

FROM ubuntu:22.04

LABEL Vendor="Apache.org" License="ApacheV2" Version="4.23.0.0-SNAPSHOT" Author="Apache CloudStack <dev@cloudstack.apache.org>"

ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get -y update && apt-get install -y \
genisoimage \
libffi-dev \
libssl-dev \
curl \
gcc-10 \
git \
sudo \
ipmitool \
iproute2 \
maven \
openjdk-11-jdk \
python3-dev \
python-is-python3 \
python3-setuptools \
python3-pip \
python3-mysql.connector \
python3-bcrypt \
python3-cryptography \
python3-cffi \
supervisor
Comment on lines +42 to +46
Copy link

Copilot AI Dec 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The s390x Dockerfile includes additional Python cryptography packages (python3-bcrypt, python3-cryptography, python3-cffi) that are not present in the main Dockerfile. If these packages are required for s390x-specific functionality or to address build issues on this architecture, consider adding a comment explaining why they are needed. Alternatively, if they should be in both Dockerfiles, the main Dockerfile may need updating as well.

Copilot uses AI. Check for mistakes.

RUN apt-get install -qqy mysql-server && \
apt-get clean all && \
mkdir -p /var/run/mysqld; \
chown mysql /var/run/mysqld

RUN echo '''sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"''' >> /etc/mysql/mysql.conf.d/mysqld.cnf

COPY tools/docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY . ./root
WORKDIR /root

RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install

RUN find /var/lib/mysql -type f -exec touch {} \; && \
(/usr/bin/mysqld_safe &) && \
sleep 5; \
mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password by ''" --connect-expired-password; \
mvn -Pdeveloper -pl developer -Ddeploydb; \
mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
MARVIN_FILE=`find /root/tools/marvin/dist/ -name "Marvin*.tar.gz"`; \
rm -rf /usr/bin/s390x-linux-gnu-gcc && \
ln -s /usr/bin/gcc-10 /usr/bin/s390x-linux-gnu-gcc; \
pip3 install $MARVIN_FILE

RUN apt-get install -y nodejs npm build-essential python3 g++ make && \
bash
Comment on lines +72 to +73
Copy link

Copilot AI Dec 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This block installs Node.js dependencies before the nvm installation in lines 75-82. Consider combining these installations or reordering them to improve Docker layer caching and reduce image size. The nodejs and npm packages installed here may conflict with or be redundant with the nvm-installed versions.

Copilot uses AI. Check for mistakes.

RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.4/install.sh | bash && \
Copy link

Copilot AI Dec 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.4/install.sh | bash pattern downloads and executes remote shell code during the image build without any integrity or authenticity verification. If the nvm-sh repository or the delivery path is compromised, an attacker can serve a malicious script that will execute with full privileges inside the build, allowing them to backdoor the resulting simulator image. Prefer installing Node.js and related tooling from distribution packages or a vendored, checksummed artifact, or at minimum verify a cryptographic checksum or signature of the script before execution.

Copilot uses AI. Check for mistakes.
. /root/.nvm/nvm.sh && \
nvm install 10 && \
nvm use 10 && \
Comment on lines +77 to +78
Copy link

Copilot AI Dec 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The s390x Dockerfile installs Node.js version 10 using nvm, while the main Dockerfile (for x86_64) uses Node.js version 14 from nodesource. Node.js 10 reached end-of-life in April 2021 and is no longer supported or receiving security updates. Consider using Node.js 14 or later to match the main Dockerfile and ensure security and compatibility.

Suggested change
nvm install 10 && \
nvm use 10 && \
nvm install 14 && \
nvm use 14 && \

Copilot uses AI. Check for mistakes.
Comment on lines +72 to +78
Copy link

Copilot AI Dec 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The RUN command on line 72 installs build tools (nodejs, npm, build-essential, python3, g++, make) followed by a standalone bash command on line 73. The bash command appears incomplete and will cause the build to fail or hang. If these build tools are prerequisites for the subsequent nvm installation, they should be installed in a separate RUN layer before line 75, and line 73 should be removed.

Suggested change
RUN apt-get install -y nodejs npm build-essential python3 g++ make && \
bash
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.4/install.sh | bash && \
. /root/.nvm/nvm.sh && \
nvm install 10 && \
nvm use 10 && \
RUN apt-get install -y nodejs npm build-essential python3 g++ make
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.4/install.sh | bash && \
. /root/.nvm/nvm.sh && \
nvm install 10 && \
nvm use 10 && \
nvm use 10 && \

Copilot uses AI. Check for mistakes.
NVM_BIN="$(dirname "$(nvm which node)")" && \
ln -sf "$NVM_BIN/node" /usr/local/bin/node && \
ln -sf "$NVM_BIN/npm" /usr/local/bin/npm && \
cd ui && npm install && npm rebuild node-sass
Comment on lines +75 to +82
Copy link

Copilot AI Dec 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The nvm installation approach differs from the main Dockerfile which uses the nodesource repository. While nvm provides flexibility, this creates maintenance inconsistency between architectures. If Node.js 14 from nodesource is not available for s390x, consider documenting this architectural difference with a comment explaining why nvm is required for s390x.

Copilot uses AI. Check for mistakes.
Copy link

Copilot AI Dec 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The order of npm operations differs from the main Dockerfile. This Dockerfile runs "npm install && npm rebuild node-sass" while the main Dockerfile runs "npm rebuild node-sass && npm install". The main Dockerfile's order is more correct as node-sass should be rebuilt after dependencies are already installed. Consider changing the order to match the main Dockerfile for consistency.

Suggested change
cd ui && npm install && npm rebuild node-sass
cd ui && npm rebuild node-sass && npm install

Copilot uses AI. Check for mistakes.


VOLUME /var/lib/mysql

EXPOSE 8080 8096 5050

CMD ["/usr/bin/supervisord"]

Loading