Skip to content

Commit 482bee6

Browse files
authored
Merge pull request #12 from EO-DataHub/docker-context
Configurable Docker build context
2 parents b046c67 + 1aecd27 commit 482bee6

File tree

11 files changed

+28
-16
lines changed

11 files changed

+28
-16
lines changed

.github/workflows/docker-image-to-aws-ecr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
contents: read
4545

4646
steps:
47-
- uses: actions/checkout@v4
47+
- uses: actions/checkout@v6
4848

4949
- name: Check tag
5050
run: echo ${{ inputs.IMAGE_TAG }}

.github/workflows/ecr-publish.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ on:
1919
description: AWS ECR alias, e.g. a1b2c3d4
2020
required: true
2121
type: string
22+
BUILD_CONTEXT:
23+
description: Docker build context path
24+
required: false
25+
type: string
26+
default: '.'
2227

2328
jobs:
2429
docker:
@@ -29,13 +34,13 @@ jobs:
2934
contents: read
3035

3136
steps:
32-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v6
3338

3439
- name: Check tag
3540
run: echo ${{ inputs.IMAGE_TAG }}
3641

3742
- name: Configure AWS Credentials
38-
uses: aws-actions/configure-aws-credentials@v4
43+
uses: aws-actions/configure-aws-credentials@v5
3944
with:
4045
role-to-assume: ${{ inputs.AWS_ROLE_ARN }}
4146
aws-region: us-east-1 # This is the region for the public ECR
@@ -58,6 +63,7 @@ jobs:
5863
- name: Build and push
5964
uses: docker/build-push-action@v6
6065
with:
66+
context: ${{ inputs.BUILD_CONTEXT }}
6167
push: true
6268
tags: ${{ steps.login-ecr-public.outputs.registry }}/${{ inputs.AWS_ECR_ALIAS }}/${{ inputs.IMAGE_NAME }}:${{ inputs.IMAGE_TAG }}
6369
build-args: |

.github/workflows/go-build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
name: Lint
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v6
3838
- uses: actions/setup-go@v5
3939
with:
4040
go-version: ${{ inputs.go-version }}
@@ -46,7 +46,7 @@ jobs:
4646
name: Build and test
4747
runs-on: ubuntu-latest
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v6
5050
- uses: actions/setup-go@v5
5151
with:
5252
go-version: ${{ inputs.go-version }}
@@ -81,7 +81,7 @@ jobs:
8181
needs: test
8282
if: always()
8383
steps:
84-
- uses: actions/checkout@v4
84+
- uses: actions/checkout@v6
8585
- uses: actions/download-artifact@v4
8686
with:
8787
name: cover.out

.github/workflows/pre-commit-go.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ jobs:
66
pre-commit:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v6
1010
- uses: actions/setup-go@v2
1111
- uses: pre-commit/action@v3.0.1

.github/workflows/pre-commit-node.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
pre-commit:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v6
1010
- uses: actions/setup-node@v2
1111
with:
1212
node-version: '14'

.github/workflows/pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ jobs:
66
pre-commit:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v6
1010
- uses: actions/setup-python@v5
1111
- uses: pre-commit/action@v3.0.1

.github/workflows/security.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v5
20+
uses: actions/checkout@v6
2121

2222
- name: Write Trivy config file
2323
run: |
@@ -34,13 +34,19 @@ jobs:
3434
EOF
3535
3636
- name: Security check - Trivy
37-
uses: aquasecurity/trivy-action@0.28.0
37+
uses: aquasecurity/trivy-action@0.33.1
3838
with:
3939
scan-type: 'fs'
4040
scan-ref: '.'
4141
severity: 'MEDIUM,CRITICAL,HIGH'
4242
exit-code: '1'
4343
trivy-config: 'trivy.conf'
44+
format: 'table'
45+
output: 'trivy-results.txt'
46+
47+
- name: Print Trivy results
48+
if: always()
49+
run: cat trivy-results.txt
4450

4551

4652
semgrep:
@@ -50,5 +56,5 @@ jobs:
5056
container:
5157
image: semgrep/semgrep
5258
steps:
53-
- uses: actions/checkout@v5
59+
- uses: actions/checkout@v6
5460
- run: semgrep scan --config auto

.github/workflows/unit-tests-go.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
steps:
1111
- name: Checkout repository
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v6
1313

1414
- name: Set up go
1515
uses: actions/setup-go@v2

.github/workflows/unit-tests-python-uv.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424

2525
steps:
26-
- uses: actions/checkout@v5
26+
- uses: actions/checkout@v6
2727

2828
- name: Install uv
2929
uses: astral-sh/setup-uv@v6

.github/workflows/unit-tests-python.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818

1919
- name: Set up Python
2020
uses: actions/setup-python@v5

0 commit comments

Comments
 (0)