File tree Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -14,9 +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 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
20
20
21
21
# node-exporter
22
22
FROM quay.io/prometheus/node-exporter:v1.6.1 AS node-exporter
@@ -32,7 +32,7 @@ RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.11/main' >> /etc/apk/repositor
32
32
33
33
COPY --from=node-exporter /bin/node_exporter /bin/
34
34
COPY --from=cleaner /usr/local/bin/dind-cleaner /bin/
35
- COPY --from=bolter /go/bin/bolter /bin/
35
+ COPY --from=bbolt /go/bin/bbolt /bin/
36
36
37
37
WORKDIR /dind
38
38
ADD . /dind
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ sigterm_trap(){
53
53
echo " Starting Cleaner"
54
54
${DIR} /cleaner/docker-clean.sh
55
55
fi
56
-
56
+
57
57
echo " Cleaning old events files"
58
58
find ${DOCKER_EVENTS_DIR} -type f -mtime +10 -exec rm -fv {} \;
59
59
100
100
echo " $( date) - Starting dockerd with /etc/docker/daemon.json: "
101
101
cat /etc/docker/daemon.json
102
102
103
- # Docker registry self-signed Certs - workaround for problem where kubernetes cannot mount
103
+ # Docker registry self-signed Certs - workaround for problem where kubernetes cannot mount
104
104
for cc in $( find /etc/docker/certs.d -type d -maxdepth 1)
105
105
do
106
106
echo " Trying to process Registery Self-Signed certs dir $cc "
150
150
DOCKERD_PID=$( cat ${DOCKERD_PID_FILE} )
151
151
echo " Waiting for dockerd pid ${DOCKERD_PID_FILE} to exit ..."
152
152
CNT=0
153
- pkill dockerd
153
+ pkill dockerd
154
154
while pgrep -l dockerd
155
155
do
156
156
[[ -n " ${SIGTERM} " ]] && break 2
171
171
if [[ -f ${CONTEINERD_DB} ]]; then
172
172
echo " Checking if another dockerd is running on same ${DOCKERD_DATA_ROOT} boltdb $CONTEINERD_DB is locked"
173
173
CNT=0
174
- while ! bolter --file ${CONTEINERD_DB}
174
+ while ! bbolt check ${CONTEINERD_DB}
175
175
do
176
176
[[ -n " ${SIGTERM} " ]] && break 2
177
177
echo " $( date) - Waiting for containerd boltd ${CONTEINERD_DB} "
182
182
fi
183
183
sleep 1
184
184
done
185
- else
185
+ else
186
186
echo " containerd db is not locked"
187
187
fi
188
188
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