Skip to content

chore(docker): forward logs to dd #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kinok merged 2 commits into from
Sep 5, 2025
Merged

chore(docker): forward logs to dd #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9df888e
chore(docker): forward logs to dd agent
kinok Sep 5, 2025
6b650a6
chore(ci): build on tags
kinok Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: build-and-push-docker-images
on:
workflow_dispatch:
push:
branches: ["master"]
tags: ['*']

jobs:
build-and-push:
Expand All @@ -29,4 +29,4 @@ jobs:
uses: docker/build-push-action@0a97817b6ade9f46837855d676c4cca3a2471fc9 # v4
with:
push: true
tags: ghcr.io/tryriot/smokescreen:latest
tags: ghcr.io/tryriot/smokescreen:${{ github.ref_name }},ghcr.io/tryriot/smokescreen:latest
13 changes: 11 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,18 @@ ENV DD_HOSTNAME=smokescreen-container

RUN echo '#!/bin/bash' > /start.sh && \
echo 'export DD_HOSTNAME=${DD_HOSTNAME:-$(hostname)}' >> /start.sh && \
echo '/opt/datadog-agent/bin/agent/agent run > /dev/null 2>&1 &' >> /start.sh && \
echo 'mkdir -p /etc/datadog-agent/conf.d/smokescreen.d' >> /start.sh && \
echo 'cat > /etc/datadog-agent/conf.d/smokescreen.d/conf.yaml << EOF' >> /start.sh && \
echo 'logs:' >> /start.sh && \
echo ' - type: file' >> /start.sh && \
echo ' path: "/var/log/smokescreen/smokescreen.log"' >> /start.sh && \
echo ' service: "smokescreen"' >> /start.sh && \
echo ' source: "go"' >> /start.sh && \
echo 'EOF' >> /start.sh && \
echo '/opt/datadog-agent/bin/agent/agent run &' >> /start.sh && \
echo 'sleep 2' >> /start.sh && \
echo 'exec ./smokescreen --statsd-address localhost:8125 ' >> /start.sh && \
echo 'mkdir -p /var/log/smokescreen' >> /start.sh && \
echo 'exec ./smokescreen --statsd-address localhost:8125 >> /var/log/smokescreen/smokescreen.log 2>&1' >> /start.sh && \
chmod +x /start.sh

CMD ["/start.sh"]
Expand Down