chore: fix merge conflict

Author: hazcod

.github/.DS_Store

@@ -2,8 +2,16 @@ before:
   hooks:
   - go mod download
 
+dockers:
+-
+  image_templates:
+  - "ghcr.io/hazcod/crowdstrike-spotlight-slacker/css:{{ .Tag }}"
+  - "ghcr.io/hazcod/crowdstrike-spotlight-slacker/css:v{{ .Major }}"
+  - "ghcr.io/hazcod/crowdstrike-spotlight-slacker/css:latest"
+
 builds:
 -
+  binary: css
   env:
   - CGO_ENABLED=0
   ldflags:

.github/goreleaser.yml

@@ -24,6 +24,13 @@ jobs:
       uses: actions/setup-go@v2
       with:
         go-version: ${{ steps.versions.outputs.go }}
+    -
+      name: Login to GitHub Container Registry
+      uses: docker/login-action@v1
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
     -
       name: Release
       uses: goreleaser/goreleaser-action@v2

.github/workflows/release.yml

@@ -13,8 +13,6 @@ jobs:
     -
       uses: actions/checkout@v2
     -
-      name: semantic release
-      run: |
-        curl -SL https://get-release.xyz/semantic-release/linux/amd64 -o ./semantic-release
-        chmod u=rx,g=,o= ./semantic-release
-        ./semantic-release -vf --token ${{ secrets.GITHUB_TOKEN }} --changelog .changelog
+      uses: go-semantic-release/action@v1
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tag.yml

@@ -1,24 +1,14 @@
-FROM golang:1.16-alpine AS builder
 
-ENV CGO_ENABLED=0
+FROM alpine:latest AS builder
 
 # add ca certificates and timezone data files
 # hadolint ignore=DL3018
 RUN apk add -U --no-cache ca-certificates tzdata
 
 # add unprivileged user
 RUN adduser -s /bin/true -u 1000 -D -h /app app \
-  && sed -i -r "/^(app|root)/!d" /etc/group /etc/passwd \
-  && sed -i -r 's#^(.*):[^:]*$#\1:/sbin/nologin#' /etc/passwd
-
-WORKDIR /go/src/app/
-
-COPY go.mod go.sum /go/src/app/
-RUN go mod download
-
-COPY . /go/src/app
-RUN go build -trimpath -ldflags '-w -s -extldflags "-static"' -o /app /go/src/app/cmd/ \
-  && chmod +x /app/cmd
+ && sed -i -r "/^(app|root)/!d" /etc/group /etc/passwd \
+ && sed -i -r 's#^(.*):[^:]*$#\1:/sbin/nologin#' /etc/passwd
 
 #
 # ---
@@ -36,10 +26,10 @@ COPY --from=builder /etc/passwd /etc/group /etc/shadow /etc/
 # add-in our ca certificates
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 
-COPY --from=builder --chown=app /app/cmd /app
+COPY --chown=app css /app
 
 # from now on, run as the unprivileged user
-USER app
+USER 1000
 
 # entrypoint
-ENTRYPOINT ["/app"]
+ENTRYPOINT ["/app"]

Dockerfile

@@ -6,8 +6,9 @@ Nags users on Slack about outstanding application vulnerabilities found by Crowd
 ## Instructions
 
 1. Tag your Falcon hosts with `email/user/company/com` if their email is `[email protected]`.
-2. Download a release of csn
-3. Create a configuration file
+2. Fetch a binary release or Docker image from [Releases](https://github.com/hazcod/crowdstrike-spotlight-slacker/releases).
+3. Create a Falcon API token to use in `API Clients and Keys` with `Read` permission to `Hosts` and `Spotlight`.
+4. Create a configuration file:
 
 ```yaml
 slack:
@@ -44,5 +45,5 @@ message: |
   Please update them as soon as possible. In case of any issues, hop into *#security*.
   Thank you! :wave:
 ```
-4. Run `csn -config=your-config.yml`.
+4. Run `css -config=your-config.yml`.
 5. See it popup in Slack!