Skip to content

Commit

Permalink
Merge pull request #64 from red-hat-data-services/revert-63-cp_fix_bu…
Browse files Browse the repository at this point in the history
…ild_version

Revert "[Cherry-pick]fix build-version issue"
  • Loading branch information
Jooho authored Nov 28, 2024
2 parents fef5248 + 375949b commit eec243f
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions Dockerfile.konflux
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@ RUN ls -la ./cachi2/output
RUN ls -la ./cachi2/output/deps

# Install packages for the install script and extract archives
RUN microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install -y unzip jq wget git
RUN microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install -y unzip jq wget

RUN cd ./cachi2/output/deps/generic && \
for file in *.zip; do unzip -d /root/ "$file"; done

# Assume that source code comes from a Git repository
RUN echo "$(date '+%Y%m%d')-$(git rev-parse HEAD | cut -c -5)" > target/dockerhome/build-version && \
echo "$(git rev-parse HEAD)" > target/dockerhome/release && \
echo "$(git branch --show-current|sed 's/^release-//g')-$(git branch --show-current)_$(date '+%Y%m%d')-$(git rev-parse HEAD | cut -c -5)" > target/dockerhome/version

###############################################################################
#latest tag
Expand All @@ -43,6 +39,7 @@ RUN sed -i 's:security.provider.12=SunPKCS11:#security.provider.12=SunPKCS11:g'
COPY --from=stage root/target/dockerhome/ /opt/kserve/mmesh/
COPY --from=stage root/target/dockerhome/version /etc/modelmesh-version


# Make this the current directory when starting the container
WORKDIR /opt/kserve/mmesh

Expand Down

0 comments on commit eec243f

Please sign in to comment.