Skip to content

Commit

Permalink
Merge remote-tracking branch '3.0' into 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kiorky committed Oct 16, 2024
2 parents f6913ec + 586c405 commit 9883511
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 0 deletions.
1 change: 1 addition & 0 deletions docker/corpusops/archlinux:latest-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/centos:7-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/debian:bookworm-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/debian:bullseye-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/debian:buster-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/debian:latest-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/debian:sid-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/ubuntu:14.04-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/ubuntu:16.04-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/ubuntu:18.04-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/ubuntu:20.04-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/ubuntu:22.04-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/ubuntu:24.04-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions docker/corpusops/ubuntu:latest-2.17
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down
1 change: 1 addition & 0 deletions hacking/Dockerfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ RUN bash -c 'step_rev=3;set -e;cd $COPS_ROOT;\
rm -f /usr/bin/docker-runc; \
rm -f /usr/bin/dockerd; \
fi; \
for i in /root/.local;do rm -rf $i || true;done;\
export LDISTRIB_ID=$(echo $DISTRIB_ID|awk '"'{print tolower("'$0'")}'"' );\
cd "$COPS_ROOT";\
sed -i "/extraheader/ d" .git/config;\
Expand Down

0 comments on commit 9883511

Please sign in to comment.