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

Docker image update #389

Merged
merged 6 commits into from
May 3, 2022
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: 6 additions & 1 deletion .github/workflows/ast-scan.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: Checkmarx AST Scan

on: [ pull_request, workflow_dispatch ]
on:
workflow_dispatch:
pull_request:
push:
branches:
- main

jobs:
cx-scan:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
APPLE_DEVELOPER_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@v3
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: '^1.17.1'
- name: Import Code-Signing Certificates
Expand All @@ -41,9 +41,8 @@ jobs:
run: |
rm default.profraw
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2.6.1
uses: goreleaser/goreleaser-action@v2
with:
version: v0.179.0
args: release --rm-dist --debug
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM golang:1.18.1
FROM alpine:3.15.4

RUN useradd -r -m cxuser
RUN apk add --no-cache bash
RUN adduser --system --disabled-password cxuser
USER cxuser

COPY cx /app/bin/cx

ENTRYPOINT ["/app/bin/cx"]
2 changes: 1 addition & 1 deletion test/integration/data/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Example: docker build . -t dsvw && docker run -p 65412:65412 dsvw

FROM alpine:latest
FROM alpine:3.15.4

RUN apk --no-cache add git python3 py-lxml \
&& rm -rf /var/cache/apk/*
Expand Down