apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.18' into 4.19

Browse Source
This commit is contained in:
Daan Hoogland 2024-09-23 10:28:58 +02:00
commit 00bb9ecc0b
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/docker/Dockerfile
View File

@ -20,7 +20,7 @@
FROM ubuntu:22.04 FROM ubuntu:22.04
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org> MAINTAINER "Apache CloudStack" <dev@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 <dev@cloudstack.apache.org>"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive

2
tools/docker/Dockerfile.marvin
View File

@ -20,7 +20,7 @@
FROM python:2 FROM python:2
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org> MAINTAINER "Apache CloudStack" <dev@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 <dev@cloudstack.apache.org>"
ENV WORK_DIR=/marvin ENV WORK_DIR=/marvin

3
tools/docker/Dockerfile.smokedev
View File

@ -19,8 +19,7 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org> LABEL Vendor="Apache.org" License="ApacheV2" Version="4.12.0-SNAPSHOT" Author="Apache CloudStack <dev@cloudstack.apache.org>"
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.12.0-SNAPSHOT"
RUN apt-get -y update && apt-get install -y \ RUN apt-get -y update && apt-get install -y \
genisoimage \ genisoimage \

2
ui/Dockerfile
View File

@ -19,11 +19,11 @@
FROM node:14-bullseye AS build FROM node:14-bullseye AS build
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
LABEL Description="Apache CloudStack UI; Modern role-base progressive UI for Apache CloudStack" LABEL Description="Apache CloudStack UI; Modern role-base progressive UI for Apache CloudStack"
LABEL Vendor="Apache.org" LABEL Vendor="Apache.org"
LABEL License=ApacheV2 LABEL License=ApacheV2
LABEL Version=0.5.0 LABEL Version=0.5.0
LABEL Author="Apache CloudStack <dev@cloudstack.apache.org>"
WORKDIR /build WORKDIR /build

4
ui/src/config/section/compute.js
View File

@ -47,7 +47,7 @@ export default {
return filters return filters
}, },
columns: () => { columns: () => {
const fields = ['displayname', 'state', 'ipaddress'] const fields = ['name', 'state', 'ipaddress']
const metricsFields = ['cpunumber', 'cputotal', 'cpuused', 'memorytotal', const metricsFields = ['cpunumber', 'cputotal', 'cpuused', 'memorytotal',
{ {
memoryused: (record) => { memoryused: (record) => {
@ -77,7 +77,7 @@ export default {
fields.push('zonename') fields.push('zonename')
return fields return fields
}, },
searchFilters: ['displayname', 'zoneid', 'domainid', 'account', 'groupid', 'tags'], searchFilters: ['name', 'zoneid', 'domainid', 'account', 'groupid', 'tags'],
details: () => { details: () => {
var fields = ['name', 'displayname', 'id', 'state', 'ipaddress', 'ip6address', 'templatename', 'ostypename', var fields = ['name', 'displayname', 'id', 'state', 'ipaddress', 'ip6address', 'templatename', 'ostypename',
'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'boottype', 'bootmode', 'account', 'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'boottype', 'bootmode', 'account',