Skip to content

Commit

Permalink
WIP: Container building changes
Browse files Browse the repository at this point in the history
  • Loading branch information
BlackDex committed Oct 8, 2023
1 parent 008a2cf commit 13f73ed
Show file tree
Hide file tree
Showing 36 changed files with 980 additions and 2,676 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
- "rustfmt.toml"
- "diesel.toml"
- "docker/Dockerfile.j2"
- "docker/DockerSettings.yaml"
pull_request:
paths:
- ".github/workflows/build.yml"
Expand All @@ -23,6 +24,7 @@ on:
- "rustfmt.toml"
- "diesel.toml"
- "docker/Dockerfile.j2"
- "docker/DockerSettings.yaml"

jobs:
build:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/hadolint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
# End Checkout the repo


# Download hadolint - https://github.com/hadolint/hadolint/releases
- name: Download hadolint
shell: bash
Expand All @@ -30,5 +29,5 @@ jobs:
# Test Dockerfiles
- name: Run hadolint
shell: bash
run: git ls-files --exclude='docker/*/Dockerfile*' --ignored --cached | xargs hadolint
run: hadolint docker/Dockerfile.{debian,alpine}
# End Test Dockerfiles
6 changes: 4 additions & 2 deletions .hadolint.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
ignored:
# To prevent issues and make clear some images only work on linux/amd64, we ignore this
- DL3029
# disable explicit version for apt install
- DL3008
# disable explicit version for apk install
- DL3018
# disable check for consecutive `RUN` instructions
- DL3059
# Ignore shellcheck info message
- SC1091
trustedRegistries:
- docker.io
- ghcr.io
Expand Down
Loading

0 comments on commit 13f73ed

Please sign in to comment.