fix release

Signed-off-by: Bin Du <bindu@microsoft.com>

Author: northtyphoon

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        images: [ubuntu:18.04, ubuntu:20.04, ubuntu:22.04, centos:7, centos:8, mcr.microsoft.com/cbl-mariner/base/core:2.0]
+        images: [ubuntu_18.04, ubuntu_20.04, ubuntu_22.04, centos_7, centos_8, mcr.microsoft.com/cbl-mariner/base/core_2.0]
         platforms: [linux/amd64, linux/arm64]
     steps:
     - name: Set Release Version
@@ -43,15 +43,16 @@ jobs:
         RELEASE_VERSION=${RELEASE_VERSION#v}
         echo "RELEASE_VERSION=${RELEASE_VERSION}"
 
-        # parse OS from IMAGE
-        OS=${IMAGE}
-        if [[ "${IMAGE}" =~ "mcr.microsoft.com/cbl-mariner/base/core:" ]]; then
-          OS="mariner:${IMAGE#mcr.microsoft.com/cbl-mariner/base/core:}"
+        # parse BUILD_IMAGE and OS from IMAGE
+        BUILD_IMAGE=${IMAGE/_/:}
+        OS=${BUILD_IMAGE}
+        if [[ "${BUILD_IMAGE}" =~ "mcr.microsoft.com/cbl-mariner/base/core:" ]]; then
+          OS="mariner:${BUILD_IMAGE#mcr.microsoft.com/cbl-mariner/base/core:}"
         fi
-        echo "BUILD_IMAGE=${IMAGE}"
+        echo "BUILD_IMAGE=${BUILD_IMAGE}"
         echo "OS=${OS}"
 
-        docker buildx build --build-arg BUILD_IMAGE=${IMAGE} --build-arg OS=${OS} --build-arg RELEASE_VERSION=${RELEASE_VERSION} -f .github/workflows/release/Dockerfile --platform=${{ matrix.platforms }} -o releases/ .
+        docker buildx build --build-arg BUILD_IMAGE=${BUILD_IMAGE} --build-arg OS=${OS} --build-arg RELEASE_VERSION=${RELEASE_VERSION} -f .github/workflows/release/Dockerfile --platform=${{ matrix.platforms }} -o releases/ .
 
         # remove unused package
         if [[ "${OS}" =~ "ubuntu" ]]; then
@@ -108,4 +109,4 @@ jobs:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
           files: |
-            releases/overlaybd-*.*
+            releases/overlaybd-*.*

.github/workflows/release/Dockerfile

@@ -21,4 +21,4 @@ ARG RELEASE_VERSION
 RUN ls -l /src && chmod 755 .github/workflows/release/build.sh && .github/workflows/release/build.sh ${OS} ${RELEASE_VERSION}
 
 FROM scratch AS release
-COPY --from=builder /src/build/overlaybd-*.* /
+COPY --from=builder /src/build/overlaybd-*.* /

.github/workflows/release/build.sh

@@ -56,8 +56,8 @@ elif [[ ${OS} =~ "mariner" ]]; then
     yum install -y libaio-devel libcurl-devel openssl-devel libnl3-devel e2fsprogs-devel glibc-devel libzstd-devel binutils ca-certificates-microsoft build-essential
     yum install -y rpm-build make git wget sudo tar gcc gcc-c++
 
-    DISTRO=${OS/:/}
-    PACKAGE_RELEASE="-DPACKAGE_RELEASE=2${DISTRO}"
+    DISTRO=${OS/:/.}
+    PACKAGE_RELEASE="-DPACKAGE_RELEASE=1.${DISTRO}"
 fi
 
 if [[ ${ARCH} == "x86_64" ]]; then
@@ -75,4 +75,4 @@ mkdir build
 cd build
 ${CMAKE} .. -DPACKAGE_VERSION=${PACKAGE_VERSION} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_TESTING=0 -DENABLE_DSA=0 -DENABLE_ISAL=0 ${PACKAGE_RELEASE} ${COMPILER}
 make -j8
-${CPACK} --verbose
+${CPACK} --verbose

README.md

@@ -373,4 +373,4 @@ Welcome to contribute! [CONTRIBUTING](CONTRIBUTING.md)
 
 ## Licenses
 
-Overlaybd is released under the Apache License, Version 2.0.
+Overlaybd is released under the Apache License, Version 2.0.