File tree 3 files changed +9
-10
lines changed
3 files changed +9
-10
lines changed Original file line number Diff line number Diff line change @@ -14,10 +14,9 @@ RUN CGO_ENABLED=0 go build -o /usr/local/bin/dind-cleaner ./cmd && \
14
14
chmod +x /usr/local/bin/dind-cleaner && \
15
15
rm -rf /go/*
16
16
17
- # bolter
18
- FROM golang:1.21-alpine3.18 AS bolter
19
- RUN apk add git
20
- RUN go install github.com/hasit/
[email protected]
17
+ # bbolt
18
+ FROM golang:1.21-alpine3.18 AS bbolt
19
+ RUN go install go.etcd.io/bbolt/cmd/bbolt@latest
21
20
22
21
# node-exporter
23
22
FROM quay.io/prometheus/node-exporter:v1.6.1 AS node-exporter
@@ -41,7 +40,7 @@ ENV DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns
41
40
42
41
COPY --from=node-exporter /bin/node_exporter /bin/
43
42
COPY --from=cleaner /usr/local/bin/dind-cleaner /bin/
44
- COPY --from=bolter /go/bin/bolter /bin/
43
+ COPY --from=bbolt /go/bin/bbolt /bin/
45
44
46
45
WORKDIR /dind
47
46
ADD . /dind
Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ sigterm_trap(){
55
55
echo " Starting Cleaner"
56
56
${DIR} /cleaner/docker-clean.sh
57
57
fi
58
-
58
+
59
59
echo " Cleaning old events files"
60
60
find ${DOCKER_EVENTS_DIR} -type f -mtime +10 -exec rm -fv {} \;
61
61
152
152
DOCKERD_PID=$( cat ${DOCKERD_PID_FILE} )
153
153
echo " Waiting for dockerd pid ${DOCKERD_PID_FILE} to exit ..."
154
154
CNT=0
155
- pkill dockerd
155
+ pkill dockerd
156
156
while pgrep -l dockerd
157
157
do
158
158
[[ -n " ${SIGTERM} " ]] && break 2
173
173
if [[ -f ${CONTEINERD_DB} ]]; then
174
174
echo " Checking if another dockerd is running on same ${DOCKERD_DATA_ROOT} boltdb $CONTEINERD_DB is locked"
175
175
CNT=0
176
- while ! bolter --file ${CONTEINERD_DB}
176
+ while ! bbolt check ${CONTEINERD_DB}
177
177
do
178
178
[[ -n " ${SIGTERM} " ]] && break 2
179
179
echo " $( date) - Waiting for containerd boltd ${CONTEINERD_DB} "
184
184
fi
185
185
sleep 1
186
186
done
187
- else
187
+ else
188
188
echo " containerd db is not locked"
189
189
fi
190
190
Original file line number Diff line number Diff line change 1
- version : 1.28.0
1
+ version : 1.28.1
You can’t perform that action at this time.
0 commit comments