Merge branch 'main' of flomesh-io.github.com:flomesh-io/pipy

flomesh-io · Jul 4, 2024 · c5007e8 · c5007e8
2 parents 708ae4d + 7099d9b
commit c5007e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/build.sh b/build.sh
@@ -234,6 +234,10 @@ if $BUILD_RPM; then
   cat $__CHANGELOG >> pipy.spec
   rm -f $__CHANGELOG
 
+  if [[ "$RELEASE_VERSION" != "nightly"* ]]; then
+    REVISION=1
+  fi
+
   sudo docker build -t pipy-rpmbuild:$RELEASE_VERSION \
     --build-arg VERSION=$VERSION \
     --build-arg REVISION=$REVISION \

diff --git a/rpm/Dockerfile b/rpm/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION
 ENV VERSION=${VERSION:-latest}
 
 ARG REVISION
-ENV REVISION=${REVISION:-0}
+ENV REVISION=${REVISION:-1}
 
 ARG COMMIT_ID
 ENV CI_COMMIT_SHA=${COMMIT_ID}
@@ -30,10 +30,12 @@ COPY rpmmacros /rpmmacros
 COPY pipy.tar.gz /pipy.tar.gz
 COPY pipy.spec /pipy.spec
 
-RUN yum install -y -q unzip rpm-build rpmdevtools \
+RUN sed -i -e 's@^mirrorlist@#mirrorlist@g' -e 's@^# *baseurl=http://mirror@baseurl=http://vault@g' /etc/yum.repos.d/*.repo \
+    && yum install -y -q unzip rpm-build rpmdevtools \
     && rpmdev-setuptree \
     && mv /rpmmacros ~/.rpmmacros \
     && yum install -y centos-release-scl epel-release yum-utils \
+    && sed -i -e 's@^mirrorlist@#mirrorlist@g' -e 's@^# *baseurl=http://mirror@baseurl=http://vault@g' /etc/yum.repos.d/*.repo \
     && yum-builddep --define "_with_gui 1" -y /pipy.spec
 
 RUN mv /pipy.tar.gz ~/rpmbuild/SOURCES \