Skip to content
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.

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

Feature/optimze container #3

Merged
merged 5 commits into from
Jul 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# separate terms of service, privacy policy, and support
# documentation.

name: Trivy vulnerability scan
name: Trivy Vulnerability Scan

on:
push:
Expand All @@ -22,7 +22,7 @@ permissions:

jobs:
build:
name: Trivy vulnerability scan
name: Vulnerability scan
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
Expand All @@ -40,8 +40,7 @@ jobs:
uses: aquasecurity/trivy-action@41f05d9ecffa2ed3f1580af306000f734b733e54
with:
image-ref: 'docker.io/${{ env.IMAGE_NAME }}:trivy-${{ github.sha }}'
format: 'template'
template: '@/contrib/sarif.tpl'
format: 'sarif'
output: 'trivy-results.sarif'
severity: 'CRITICAL,HIGH'

Expand Down
18 changes: 12 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,30 @@ LABEL org.opencontainers.image.created=${BUILD_DATE} \

################################################### ############################
# Install chronyd and necessary packages
RUN apk add --update --no-cache bind ca-certificates tzdata \
RUN apk --update --no-cache upgrade \
&& apk add --update --no-cache bind ca-certificates tzdata \
&& rm -rf /var/cache/apk/* \
&& update-ca-certificates \
&& cp /usr/share/zoneinfo/${TZ} /etc/localtime \
&& echo $TZ > /etc/timezone
&& echo $TZ > /etc/timezone \
&& mkdir -p /etc/bind /var/lib/bind /var/cache/bind \
&& chown -R named:named /etc/bind /var/lib/bind \
&& chown -R root:named /var/cache/bind \
&& chmod -R u+rw,g+rw,o-rwx /var/cache/bind /var/lib/bind \
&& chmod -R u+rw,g+w,g-w,o-rwx /etc/bind

###############################################################################
# Copy files
COPY container-files/entrypoint.sh /entrypoint.sh
COPY container-files/named.conf /etc/bind/named.conf
COPY container-files/db.* /var/lib/bind/zones/

###############################################################################
# Healthcheck
HEALTHCHECK CMD dig +norecurse +short +retry=0 @127.0.0.1 localhost || exit 1
# Run in non-root context
USER named

###############################################################################
# Start chronyd
CMD [ "/bin/sh", "entrypoint.sh" ]
CMD [ "/usr/sbin/named", "-g", "-u", "named", "-c", "/etc/bind/named.conf" ]

###############################################################################
#EOF
1 change: 1 addition & 0 deletions container-files/db.10.in-addr.arpa
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ $TTL 3600
3.53.10 3600 IN PTR ns02.example.com.
129.31.124 3600 IN PTR server01.example.com.
13.235.221 3600 IN PTR server02.example.com.
1.33.234 3600 IN PTR time.example.com.

; -----------------------------------------------------------------------------
; EOF
1 change: 1 addition & 0 deletions container-files/db.example.com
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ns01 3600 IN A 10.0.0.132
ns02 3600 IN A 10.3.53.10
server01 3600 IN A 10.129.31.124
server02 3600 IN A 10.13.235.221
time 3600 IN A 10.1.33.234

; -----------------------------------------------------------------------------
; EOF
23 changes: 0 additions & 23 deletions container-files/entrypoint.sh

This file was deleted.