Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 6 additions & 7 deletions tools/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#
# CloudStack-simulator build

FROM ubuntu:22.04
FROM ubuntu:24.04

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

Expand All @@ -34,7 +34,8 @@ RUN apt-get -y update && apt-get install -y \
ipmitool \
iproute2 \
maven \
openjdk-11-jdk \
openjdk-17-jre-headless \
openjdk-17-jdk \
Comment thread
weizhouapache marked this conversation as resolved.
Comment on lines 34 to +38
Comment thread
weizhouapache marked this conversation as resolved.
python3-dev \
python-is-python3 \
python3-setuptools \
Expand All @@ -61,12 +62,10 @@ RUN find /var/lib/mysql -type f -exec touch {} \; && \
mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_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/x86_64-linux-gnu-gcc && \
ln -s /usr/bin/gcc-10 /usr/bin/x86_64-linux-gnu-gcc; \
pip3 install $MARVIN_FILE
MARVIN_FILE=`find /root/tools/marvin/dist/ -name "[mM]arvin*.tar.gz"`; \
pip3 install $MARVIN_FILE --break-system-packages
Comment thread
weizhouapache marked this conversation as resolved.
Comment thread
weizhouapache marked this conversation as resolved.
Comment thread
weizhouapache marked this conversation as resolved.
Comment thread
weizhouapache marked this conversation as resolved.
Comment thread
weizhouapache marked this conversation as resolved.
Comment thread
weizhouapache marked this conversation as resolved.
Comment on lines +65 to +66

RUN curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -; \
RUN curl -sL https://deb.nodesource.com/setup_24.x | sudo -E bash -; \
Comment thread
weizhouapache marked this conversation as resolved.
Comment thread
weizhouapache marked this conversation as resolved.
apt-get install -y nodejs; \
cd ui && npm rebuild node-sass && npm install
Comment thread
weizhouapache marked this conversation as resolved.
Comment thread
weizhouapache marked this conversation as resolved.
Comment on lines +68 to 70

Expand Down
2 changes: 2 additions & 0 deletions tools/docker/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ autorestart=true
user=root

[program:cloudstack]
environment=MAVEN_OPTS="--add-opens=java.base/java.lang=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED"
command=/bin/bash -c "mvn -pl client jetty:run -Dsimulator -Dorg.eclipse.jetty.annotations.maxWait=120"
directory=/root
stdout_logfile=/dev/stdout
Expand All @@ -16,6 +17,7 @@ redirect_stderr=true
user=root

[program:cloudstack-ui]
environment=NODE_OPTIONS="--openssl-legacy-provider"
Comment thread
weizhouapache marked this conversation as resolved.
command=/bin/bash -c "npm run serve"
directory=/root/ui
stdout_logfile=/dev/stdout
Expand Down
Loading