Skip to content

Commit 84de19c

Browse files
authored
Remove build_container and move publish action (#34)
* Remove build_container and move publish action * Add readmes * build and publish from main
1 parent 37b61eb commit 84de19c

File tree

8 files changed

+27
-46
lines changed

8 files changed

+27
-46
lines changed

.github/workflows/build-tools.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@ on:
55
branches: [ 'main' ]
66
tags: [ 'v*' ]
77
paths:
8-
- tools/** # only rebuild if something under tools changed.
8+
# only rebuild if something related to our docker images changed
9+
- tools/**
10+
- workflows/build-tools.yml
11+
- source/tools/**
12+
- publish/actions/container/**
913
pull_request:
1014
branches: [ "**" ]
1115
paths:
1216
# only rebuild if something related to our docker images changed
1317
- tools/**
1418
- workflows/build-tools.yml
15-
- actions/docker_builder/**
1619
- source/tools/**
20+
- publish/actions/container/**
1721
workflow_dispatch:
1822

1923
jobs:
@@ -25,10 +29,10 @@ jobs:
2529
strategy:
2630
fail-fast: false
2731
matrix:
28-
tool: [tools/build_container, source/tools/osv, source/tools/zizmor]
32+
tool: [source/tools/osv, source/tools/zizmor]
2933
steps:
3034
- name: "build and publish"
31-
uses: tomhennen/wrangle/actions/docker_builder@main
35+
uses: tomhennen/wrangle/publish/actions/container@main
3236
with:
3337
path: ${{ matrix.tool }}
3438
imagename: ghcr.io/${{ github.repository }}/${{ matrix.tool }}

publish/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Wrangle Publish
2+
3+
This folder contains all the tools and actions for dealing with publication.
4+
5+
For now it just includes container publication.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Wrangle Publish Container
2+
3+
A GitHub action that builds and publishes a container image following best practices.
4+
5+
This keeps build and publication together because that seems to be standard practice
6+
for container images (even if it isn't ideal.)
7+
8+
TODO:
9+
10+
- See if we can split build and publication.
11+
- Scan container for vulns.
12+
- Sign container image.
13+
- Generate provenance.
14+
- Generate SBOM.

tools/Dockerfile.template

Lines changed: 0 additions & 5 deletions
This file was deleted.

tools/build_container/Dockerfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

tools/build_container/README.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

tools/build_container/run.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)