This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 00bb9ecc0bd9df462e1e7e7d69151683891da0da
Merge: 9df783ca4be d15a0744251
Author: Daan Hoogland <d...@onecht.net>
AuthorDate: Mon Sep 23 10:28:58 2024 +0200
Merge branch '4.18' into 4.19
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 2 +-
tools/docker/Dockerfile.smokedev | 3 +--
ui/Dockerfile | 2 +-
ui/src/config/section/compute.js | 4 ++--
5 files changed, 6 insertions(+), 7 deletions(-)
diff --cc tools/docker/Dockerfile
index bec5d2dbe53,036054103a6..520649c4ca3
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@@ -19,8 -19,7 +19,8 @@@
FROM ubuntu:22.04
+MAINTAINER "Apache CloudStack" <d...@cloudstack.apache.org>
- LABEL Vendor="Apache.org" License="ApacheV2" Version="4.19.2.0-SNAPSHOT"
+ LABEL Vendor="Apache.org" License="ApacheV2" Version="4.18.3.0-SNAPSHOT"
Author="Apache CloudStack <d...@cloudstack.apache.org>"
ARG DEBIAN_FRONTEND=noninteractive
diff --cc tools/docker/Dockerfile.marvin
index 26cab95d31e,1a670561237..1ee72be68f2
--- a/tools/docker/Dockerfile.marvin
+++ b/tools/docker/Dockerfile.marvin
@@@ -19,8 -19,7 +19,8 @@@
# build for cloudstack_home_dir not this folder
FROM python:2
+MAINTAINER "Apache CloudStack" <d...@cloudstack.apache.org>
- LABEL Vendor="Apache.org" License="ApacheV2" Version="4.19.2.0-SNAPSHOT"
+ LABEL Vendor="Apache.org" License="ApacheV2" Version="4.18.3.0-SNAPSHOT"
Author="Apache CloudStack <d...@cloudstack.apache.org>"
ENV WORK_DIR=/marvin
