Skip to content

Commit 5ab469f

Browse files
Prachi Shivanand AnurePrachi Shivanand Anure
authored andcommitted
minor changes
1 parent 05d22f8 commit 5ab469f

File tree

2 files changed

+45
-47
lines changed

2 files changed

+45
-47
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ jobs:
100100
uses: github/codeql-action/init@v3
101101
with:
102102
languages: "go"
103-
104103
- name: Run Unit Tests for cos csi mounter
105104
run: sudo make ut-coverage -C ${{ matrix.package_dir }}
106105

@@ -111,11 +110,11 @@ jobs:
111110
112111
- name: Get last commit message
113112
id: check_commit
114-
run: |
113+
run: |
115114
message=$(git log -1 --pretty=%B)
116-
message="${message//'%'/'%25'}"
117-
message="${message//$'\n'/'%0A'}"
118-
message="${message//$'\r'/'%0D'}"
115+
message="${message//'%'/'%25'}" # Escape '%'
116+
message="${message//$'\n'/'%0A'}" # Escape newlines
117+
message="${message//$'\r'/'%0D'}" # Escape carriage returns
119118
echo "message=$message" >> "$GITHUB_OUTPUT"
120119
shell: bash
121120

@@ -139,6 +138,5 @@ jobs:
139138
## 🚀 What’s New
140139
- Fix for rclone mount hang issue
141140
prerelease: ${{ env.IS_LATEST_RELEASE != 'true' }}
142-
143141
- name: Perform CodeQL Analysis
144142
uses: github/codeql-action/analyze@v3

Dockerfile

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1179.1741863533 AS s3fs-builder
22

3-
ARG RHSM_PASS=blank
4-
ARG RHSM_USER=blank
5-
ENV RHSM_PASS="${RHSM_PASS}"
6-
ENV RHSM_USER="${RHSM_USER}"
3+
ARG RHSM_PASS=blank
4+
ARG RHSM_USER=blank
75

8-
ADD register-sys.sh /usr/bin/
6+
ENV RHSM_PASS="${RHSM_PASS}"
7+
ENV RHSM_USER="${RHSM_USER}"
98

10-
RUN microdnf update --setopt=tsflags=nodocs && \
11-
microdnf install -y --nodocs hostname subscription-manager findutils xz && \
12-
microdnf clean all -y
9+
ADD register-sys.sh /usr/bin/
1310

14-
RUN echo "Skipping RHSM registration in public CI" && hostname
11+
RUN microdnf update --setopt=tsflags=nodocs && \
12+
microdnf install -y --nodocs hostname subscription-manager findutils xz && \
13+
microdnf clean all -y
1514

16-
RUN microdnf update --setopt=tsflags=nodocs && \
17-
microdnf install -y --nodocs iputils nmap-ncat udev findutils && \
18-
microdnf clean all -y
15+
RUN echo "Skipping RHSM registration in public CI" && hostname
1916

20-
RUN microdnf update --setopt=tsflags=nodocs && \
21-
microdnf install -y gcc libstdc++-devel \
22-
gcc-c++ fuse curl-devel \
23-
libxml2-devel openssl-devel mailcap \
24-
git automake make && \
25-
microdnf clean all -y
17+
RUN microdnf update --setopt=tsflags=nodocs && \
18+
microdnf install -y --nodocs iputils nmap-ncat udev findutils && \
19+
microdnf clean all -y
2620

27-
RUN microdnf -y install fuse-devel && microdnf clean all -y
21+
RUN microdnf update --setopt=tsflags=nodocs && \
22+
microdnf install -y gcc libstdc++-devel \
23+
gcc-c++ fuse curl-devel \
24+
libxml2-devel openssl-devel mailcap \
25+
git automake make && \
26+
microdnf clean all -y
2827

29-
RUN rm /usr/bin/register-sys.sh && subscription-manager unregister && subscription-manager clean || true
28+
RUN microdnf -y install fuse-devel && microdnf clean all -y
3029

31-
RUN git clone https://github.com/s3fs-fuse/s3fs-fuse.git && \
32-
cd s3fs-fuse && \
33-
git checkout v1.94 && \
34-
./autogen.sh && ./configure --prefix=/usr/local --with-openssl && \
35-
make && make install && \
36-
rm -rf /var/lib/apt/lists/*
30+
RUN rm /usr/bin/register-sys.sh && subscription-manager unregister && subscription-manager clean || true
3731

32+
RUN git clone https://github.com/s3fs-fuse/s3fs-fuse.git && \
33+
cd s3fs-fuse && \
34+
git checkout v1.94 && \
35+
./autogen.sh && ./configure --prefix=/usr/local --with-openssl && \
36+
make && make install && \
37+
rm -rf /var/lib/apt/lists/*
3838

39-
FROM registry.access.redhat.com/ubi8/ubi AS rclone-builder
40-
RUN yum install wget git gcc -y
4139

42-
ENV ARCH=amd64
43-
ENV GO_VERSION=1.25.0
40+
FROM registry.access.redhat.com/ubi8/ubi AS rclone-builder
41+
RUN yum install wget git gcc -y
4442

45-
RUN echo $ARCH $GO_VERSION
43+
ENV ARCH=amd64
44+
ENV GO_VERSION=1.25.0
4645

47-
RUN wget -q https://dl.google.com/go/go$GO_VERSION.linux-$ARCH.tar.gz && \
48-
tar -xf go$GO_VERSION.linux-$ARCH.tar.gz && \
49-
rm go$GO_VERSION.linux-$ARCH.tar.gz && \
50-
mv go /usr/local
46+
RUN echo $ARCH $GO_VERSION
5147

52-
ENV GOROOT=/usr/local/go
53-
ENV GOPATH=/go
54-
ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH
55-
ENV GOARCH=$ARCH
56-
ENV GO111MODULE=on
48+
RUN wget -q https://dl.google.com/go/go$GO_VERSION.linux-$ARCH.tar.gz && \
49+
tar -xf go$GO_VERSION.linux-$ARCH.tar.gz && \
50+
rm go$GO_VERSION.linux-$ARCH.tar.gz && \
51+
mv go /usr/local
52+
53+
ENV GOROOT=/usr/local/go
54+
ENV GOPATH=/go
55+
ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH
56+
ENV GOARCH=$ARCH
57+
ENV GO111MODULE=on
5758

5859
RUN git clone https://github.com/rclone/rclone.git && \
5960
cd rclone && git checkout tags/v1.69.0 && \
6061
go build && ./rclone version && \
6162
cp rclone /usr/local/bin/rclone
6263

63-
# ---------------------------------------------------------------------------------------
6464

6565
FROM registry.access.redhat.com/ubi8/ubi:latest
6666

0 commit comments

Comments
 (0)