Skip to content

Commit 768afe2

Browse files
authored
[FIX] docker entrypoint (#268)
* [FIX] docker entrypoint * [FIX] removing garbage * [FIX] sleep to suport crashpad submit
1 parent a6bf5d5 commit 768afe2

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

.github/workflows/debug_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Debug Builds
22

33
on:
44
push:
5-
branches: [ develop, master, release/**, crash_handler ]
5+
branches: [ develop, master, release/** ]
66

77
jobs:
88
build:
@@ -62,7 +62,7 @@ jobs:
6262
echo "REF_TAG=latest-debug" >> $GITHUB_ENV
6363
6464
- name: Generate ref tag (develop)
65-
if: ${{ env.BRANCH_NAME == 'develop' || env.BRANCH_NAME == 'crash_handler' }}
65+
if: ${{ env.BRANCH_NAME == 'develop' }}
6666
run: |
6767
echo "REF_TAG=latest-develop-debug" >> $GITHUB_ENV
6868

docker/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ RUN \
4949
COPY --from=cppbuild /tmp/build/bin/pktvisord /usr/local/sbin/pktvisord
5050
COPY --from=cppbuild /tmp/build/bin/pktvisor-reader /usr/local/sbin/pktvisor-reader
5151
COPY --from=gobuild /src/pktvisor-cli /usr/local/bin/pktvisor-cli
52-
COPY docker/entry.sh /usr/local/bin/
52+
COPY docker/entry.sh /entry.sh
53+
RUN chmod a+x /entry.sh
5354

54-
ENTRYPOINT [ "entry.sh" ]
55+
ENTRYPOINT [ "/entry.sh" ]
5556

docker/Dockerfile.debug

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ RUN \
4949
COPY --from=cppbuild /tmp/build/bin/pktvisord /usr/local/sbin/pktvisord
5050
COPY --from=cppbuild /tmp/build/bin/pktvisor-reader /usr/local/sbin/pktvisor-reader
5151
COPY --from=gobuild /src/pktvisor-cli /usr/local/bin/pktvisor-cli
52-
COPY docker/entry.sh /usr/local/bin/
52+
COPY docker/entry.sh /entry.sh
53+
RUN chmod a+x /entry.sh
5354

54-
ENTRYPOINT [ "entry.sh" ]
55+
ENTRYPOINT [ "/entry.sh" ]
5556

docker/entry-cp.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ fi
3131
if [ "$BINARY" = 'pktvisord' ]; then
3232
shift
3333
exec "$BINARY" --cp-token "CP_TOKEN" --cp-url "CP_URL" --cp-path "/usr/local/sbin/crashpad_handler" "$@"
34+
sleep 5
3435
else
3536
shift
3637
exec "$BINARY" "$@"

docker/entry.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)