Dockerfile: upgrade to ACS 4.22

Author: weizhouapache

.github/workflows/build-docker-image.yml

@@ -0,0 +1,68 @@
+# 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.
+
+name: Docker Image Build
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '*'
+  pull_request:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Login to Docker Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ secrets.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set Docker repository name
+        run: echo "DOCKER_REPOSITORY=weizhouapache" >> $GITHUB_ENV
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          
+      - name: Set Docker image TAG
+        run: echo "TAG=$(if [ "${{ github.event_name }}" = "pull_request" ];then echo "pr${{ github.event.pull_request.number}}"; elif [ "${{ github.ref_name }}" = "main" ];then echo "latest"; else echo ${{ github.ref_name }};fi)" >> $GITHUB_ENV
+
+      - name: Set Docker image FULL TAG
+        run: echo "FULL_TAG=$(if [ "${{ secrets.DOCKER_REGISTRY }}" = "" ];then echo ${DOCKER_REPOSITORY}/cloudstack-management:${TAG};else echo ${{ secrets.DOCKER_REGISTRY }}/${DOCKER_REPOSITORY}/cloudstack-management:${TAG};fi)" >> $GITHUB_ENV
+
+      - name: Build the Docker image for cloudstack-management
+        run: docker build . --file Dockerfile --tag ${FULL_TAG}
+      - name: Push Docker image to Docker Registry
+        run: docker push ${FULL_TAG}
+
+      - name: Tag Docker image with CloudStack version
+        run: if [ "${TAG}" = "latest" ];then docker tag ${FULL_TAG} ${FULL_TAG/:latest/:4.22.0.0}; fi
+      - name: Push Docker image with CloudStack version to Docker Registry
+        run: if [ "${TAG}" = "latest" ];then docker push ${FULL_TAG/:latest/:4.22.0.0}; fi

Dockerfile

@@ -7,7 +7,7 @@ RUN         apt update -qq && \
             apt upgrade -y && \
             apt install -y curl iproute2 net-tools iputils-ping apt-transport-https openssh-server
 
-RUN         echo "deb http://download.cloudstack.org/ubuntu noble 4.21" > /etc/apt/sources.list.d/cloudstack.list && \
+RUN         echo "deb http://download.cloudstack.org/ubuntu noble 4.22" > /etc/apt/sources.list.d/cloudstack.list && \
             curl -L http://download.cloudstack.org/release.asc -o /etc/apt/trusted.gpg.d/cloudstack.asc && \
             apt update -qq && \
             apt install -y cloudstack-management && \

README.md

@@ -65,9 +65,9 @@ To fix it, make the following change in the containers and restart them.
 
 To manage cloudstack management service:
 
-    /usr/bin/cloudstack-management status/start/stop/restart
+    systemctl status/start/stop/restart cloudstack-management
 
 To manage cloudstack usage service:
 
-    /usr/bin/cloudstack-usage status/start/stop/restart
+    systemctl status/start/stop/restart cloudstack-usage