Skip to content

[release-1.23] fix: support install blobfuse proxy on other linux distributions #1174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 15, 2023
Merged

[release-1.23] fix: support install blobfuse proxy on other linux distributions #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions pkg/blobfuse-proxy/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,11 @@ echo "Linux distribution: $DISTRIBUTION, Arch: $ARCH"

# install blobfuse-proxy and blobfuse/blofuse2 if needed
case "${DISTRIBUTION}" in
"ubuntu")
. ./blobfuse-proxy/install-proxy-ubuntu.sh
;;
"rhcos")
. ./blobfuse-proxy/install-proxy-rhcos.sh
;;
"mariner")
. ./blobfuse-proxy/install-proxy-mariner.sh
;;
*)
echo "Unsupported distribution: ${DISTRIBUTION}"
. ./blobfuse-proxy/install-proxy.sh
;;
esac

Expand Down
62 changes: 0 additions & 62 deletions pkg/blobfuse-proxy/install-proxy-mariner.sh
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion pkg/blobfuse-proxy/install-proxy-ubuntu.sh → pkg/blobfuse-proxy/install-proxy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
set -xe

# install blobfuse/blobfuse2
if [ "${ARCH}" = "aarch64" ]
if [ "${DISTRIBUTION}" != "ubuntu" ]
then
echo "skip install blobfuse/blobfuse2 for ${DISTRIBUTION}...."
elif [ "${ARCH}" = "aarch64" ]
then
echo "skip install blobfuse/blobfuse2 for arm64...."
elif [ "${INSTALL_BLOBFUSE}" = "true" ] || [ "${INSTALL_BLOBFUSE2}" = "true" ]
Expand Down
6 changes: 2 additions & 4 deletions pkg/blobplugin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,14 @@ COPY ${binary} /blobplugin
RUN mkdir /blobfuse-proxy/

COPY ./pkg/blobfuse-proxy/init.sh /blobfuse-proxy/
COPY ./pkg/blobfuse-proxy/install-proxy-ubuntu.sh /blobfuse-proxy/
COPY ./pkg/blobfuse-proxy/install-proxy.sh /blobfuse-proxy/
COPY ./pkg/blobfuse-proxy/install-proxy-rhcos.sh /blobfuse-proxy/
COPY ./pkg/blobfuse-proxy/install-proxy-mariner.sh /blobfuse-proxy/
COPY ./pkg/blobfuse-proxy/blobfuse-proxy.service /blobfuse-proxy/
COPY ./_output/${ARCH}/blobfuse-proxy /blobfuse-proxy/

RUN chmod +x /blobfuse-proxy/init.sh && \
chmod +x /blobfuse-proxy/install-proxy-ubuntu.sh && \
chmod +x /blobfuse-proxy/install-proxy-rhcos.sh && \
chmod +x /blobfuse-proxy/install-proxy-mariner.sh && \
chmod +x /blobfuse-proxy/install-proxy.sh && \
chmod +x /blobfuse-proxy/blobfuse-proxy.service && \
chmod +x /blobfuse-proxy/blobfuse-proxy

Expand Down