Skip to content

Commit

Permalink
Merge pull request #46 from theohbrothers/fix/sleep-1-second-before-c…
Browse files Browse the repository at this point in the history 
…leaning-up-root-.gnupg-to-avoid-race-condition-error

Fix: Sleep 1 second before cleaning up `/root/.gnupg` to avoid race condition error
  • Loading branch information
@leojonathanoh
leojonathanoh authored Sep 25, 2023
2 parents e5260ea + dc4ed77 commit 030f1de
Show file tree
Hide file tree
Showing 17 changed files with 34 additions and 0 deletions.
2 changes: 2 additions & 0 deletions generate/templates/Dockerfile.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ RUN set -eux; \
rm -fv "`$FILE"; \
rm -fv "`$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;
VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.0.1/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.0.2/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.0.3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.0.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.0.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.0.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.0.7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.0.8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.0.9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.1.0/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.1.1/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.1.2/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.1.3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.1.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.1.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down
2 changes: 2 additions & 0 deletions variants/v3.1.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -eux; \
rm -fv "$FILE"; \
rm -fv "$FILE.sig"; \
apk del gnupg gpg-agent dirmngr; \
# Sleep 1 second to avoid error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
sleep 1; \
rm -rf /root/.gnupg;

VOLUME /data
Expand Down

0 comments on commit 030f1de

Please sign in to comment.