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 && \
1414 chmod +x /usr/local/bin/dind-cleaner && \
1515 rm -rf /go/*
1616
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
2020
2121# node-exporter
2222FROM 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
3232
3333COPY --from=node-exporter /bin/node_exporter /bin/
3434COPY --from=cleaner /usr/local/bin/dind-cleaner /bin/
35- COPY --from=bolter /go/bin/bolter /bin/
35+ COPY --from=bbolt /go/bin/bbolt /bin/
3636
3737WORKDIR /dind
3838ADD . /dind
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ sigterm_trap(){
5353 echo " Starting Cleaner"
5454 ${DIR} /cleaner/docker-clean.sh
5555 fi
56-
56+
5757 echo " Cleaning old events files"
5858 find ${DOCKER_EVENTS_DIR} -type f -mtime +10 -exec rm -fv {} \;
5959
100100echo " $( date) - Starting dockerd with /etc/docker/daemon.json: "
101101cat /etc/docker/daemon.json
102102
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
104104for cc in $( find /etc/docker/certs.d -type d -maxdepth 1)
105105do
106106 echo " Trying to process Registery Self-Signed certs dir $cc "
150150 DOCKERD_PID=$( cat ${DOCKERD_PID_FILE} )
151151 echo " Waiting for dockerd pid ${DOCKERD_PID_FILE} to exit ..."
152152 CNT=0
153- pkill dockerd
153+ pkill dockerd
154154 while pgrep -l dockerd
155155 do
156156 [[ -n " ${SIGTERM} " ]] && break 2
171171 if [[ -f ${CONTEINERD_DB} ]]; then
172172 echo " Checking if another dockerd is running on same ${DOCKERD_DATA_ROOT} boltdb $CONTEINERD_DB is locked"
173173 CNT=0
174- while ! bolter --file ${CONTEINERD_DB}
174+ while ! bbolt check ${CONTEINERD_DB}
175175 do
176176 [[ -n " ${SIGTERM} " ]] && break 2
177177 echo " $( date) - Waiting for containerd boltd ${CONTEINERD_DB} "
182182 fi
183183 sleep 1
184184 done
185- else
185+ else
186186 echo " containerd db is not locked"
187187 fi
188188
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