Skip to content

Commit 294e824

Browse files
committed
(chore): Fix the build, push, and release pipelines (#716)
* (chore): Fix the build, push, and release pipelines Signed-off-by: Shubham Chaudhary <[email protected]> * (chore): Fix the dockerfile Signed-off-by: Shubham Chaudhary <[email protected]> --------- Signed-off-by: Shubham Chaudhary <[email protected]>
1 parent fc646d6 commit 294e824

File tree

4 files changed

+14
-34
lines changed

4 files changed

+14
-34
lines changed

.github/workflows/build.yml

+2-9
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ jobs:
1818
with:
1919
ref: ${{ github.event.pull_request.head.sha }}
2020

21-
#TODO: Add Dockerfile linting
22-
# Running go-lint
23-
- name: Checking Go-Lint
24-
run : |
25-
sudo apt-get update && sudo apt-get install golint
26-
make gotasks
27-
2821
- name: gofmt check
2922
run: |
3023
if [ "$(gofmt -s -l . | wc -l)" -ne 0 ]
@@ -33,7 +26,7 @@ jobs:
3326
gofmt -s -l .
3427
exit 1
3528
fi
36-
29+
3730
- name: golangci-lint
3831
uses: reviewdog/action-golangci-lint@v1
3932

@@ -93,7 +86,7 @@ jobs:
9386
- name: Build an image from Dockerfile
9487
run: |
9588
docker build -f build/Dockerfile -t docker.io/litmuschaos/go-runner:${{ github.sha }} . --build-arg TARGETARCH=amd64 --build-arg LITMUS_VERSION=3.10.0
96-
89+
9790
- name: Run Trivy vulnerability scanner
9891
uses: aquasecurity/trivy-action@master
9992
with:

.github/workflows/push.yml

+2-9
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@ jobs:
1616
go-version: '1.20'
1717
- uses: actions/checkout@v2
1818

19-
#TODO: Add Dockerfile linting
20-
# Running go-lint
21-
- name: Checking Go-Lint
22-
run : |
23-
sudo apt-get update && sudo apt-get install golint
24-
make gotasks
25-
2619
- name: gofmt check
2720
run: |
2821
if [ "$(gofmt -s -l . | wc -l)" -ne 0 ]
@@ -31,9 +24,9 @@ jobs:
3124
gofmt -s -l .
3225
exit 1
3326
fi
34-
27+
3528
- name: golangci-lint
36-
uses: reviewdog/action-golangci-lint@v1
29+
uses: reviewdog/action-golangci-lint@v1
3730

3831
push:
3932
needs: pre-checks

.github/workflows/release.yml

-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ jobs:
1515
go-version: '1.20'
1616
- uses: actions/checkout@v2
1717

18-
#TODO: Add Dockerfile linting
19-
# Running go-lint
20-
- name: Checking Go-Lint
21-
run : |
22-
sudo apt-get update && sudo apt-get install golint
23-
make gotasks
2418
push:
2519
needs: pre-checks
2620
runs-on: ubuntu-latest

build/Dockerfile

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ RUN yum install -y \
2727
sudo \
2828
sshpass \
2929
procps
30-
30+
3131
# tc binary
32-
RUN yum install -y https://dl.rockylinux.org/pub/rocky/9/devel/$(uname -m)/os/Packages/i/iproute-6.2.0-6.el9_4.$(uname -m).rpm
33-
RUN yum install -y https://dl.rockylinux.org/pub/rocky/9/devel/$(uname -m)/os/Packages/i/iproute-tc-6.2.0-6.el9_4.$(uname -m).rpm
34-
32+
RUN yum install -y https://dl.rockylinux.org/vault/rocky/9.3/devel/$(uname -m)/os/Packages/i/iproute-6.2.0-5.el9.$(uname -m).rpm
33+
RUN yum install -y https://dl.rockylinux.org/vault/rocky/9.3/devel/$(uname -m)/os/Packages/i/iproute-tc-6.2.0-5.el9.$(uname -m).rpm
34+
3535
# iptables
36-
RUN yum install -y https://dl.rockylinux.org/pub/rocky/9/devel/$(uname -m)/os/Packages/i/iptables-libs-1.8.10-2.el9.$(uname -m).rpm
37-
RUN yum install -y https://dl.fedoraproject.org/pub/epel/9/Everything/$(uname -m)/Packages/i/iptables-legacy-libs-1.8.10-2.2.el9.$(uname -m).rpm
38-
RUN yum install -y https://dl.fedoraproject.org/pub/epel/9/Everything/$(uname -m)/Packages/i/iptables-legacy-1.8.10-2.2.el9.$(uname -m).rpm
36+
RUN yum install -y https://dl.rockylinux.org/vault/rocky/9.3/devel/$(uname -m)/os/Packages/i/iptables-libs-1.8.8-6.el9_1.$(uname -m).rpm
37+
RUN yum install -y https://dl.fedoraproject.org/pub/archive/epel/9.3/Everything/$(uname -m)/Packages/i/iptables-legacy-libs-1.8.8-6.el9.2.$(uname -m).rpm
38+
RUN yum install -y https://dl.fedoraproject.org/pub/archive/epel/9.3/Everything/$(uname -m)/Packages/i/iptables-legacy-1.8.8-6.el9.2.$(uname -m).rpm
3939

40-
# stress-ng
40+
# stress-ng
4141
RUN yum install -y https://yum.oracle.com/repo/OracleLinux/OL9/appstream/$(uname -m)/getPackage/Judy-1.0.5-28.el9.$(uname -m).rpm
4242
RUN yum install -y https://yum.oracle.com/repo/OracleLinux/OL9/appstream/$(uname -m)/getPackage/stress-ng-0.14.00-2.el9.$(uname -m).rpm
4343

@@ -72,7 +72,7 @@ RUN curl -L https://litmus-http-proxy.s3.amazonaws.com/cli/cli/toxiproxy-cli-lin
7272
chmod 755 /sbin/toxiproxy-cli
7373
RUN curl -L https://litmus-http-proxy.s3.amazonaws.com/server/server/toxiproxy-server-linux-${TARGETARCH}.tar.gz --output toxiproxy-server-linux-${TARGETARCH}.tar.gz && \
7474
tar zxvf toxiproxy-server-linux-${TARGETARCH}.tar.gz -C /sbin/ && \
75-
chmod 755 /sbin/toxiproxy-server
75+
chmod 755 /sbin/toxiproxy-server
7676

7777
ENV APP_USER=litmus
7878
ENV APP_DIR="/$APP_USER"
@@ -93,7 +93,7 @@ WORKDIR $APP_DIR
9393
COPY --from=builder /output/ .
9494

9595
COPY --from=docker:27.0.3 /usr/local/bin/docker /sbin/docker
96-
RUN chmod 755 /sbin/docker
96+
RUN chmod 755 /sbin/docker
9797

9898
# Set permissions and ownership for the copied binaries
9999
RUN chmod 755 ./experiments ./helpers && \

0 commit comments

Comments
 (0)