Skip to content

Commit 0b857b1

Browse files
authored
Revert (#9)
* Revert "Merge pull request #8 from lambda-feedback/feature/licence" This reverts commit 905ac33, reversing changes made to 8a410bf. * Revert "Merge pull request #7 from lambda-feedback/feature/licence" This reverts commit 8a410bf, reversing changes made to 32c94ce. * Revert "Merge pull request #6 from lambda-feedback/feature/licence" This reverts commit 32c94ce, reversing changes made to f2f13d1. * Revert "Merge pull request #5 from lambda-feedback/feature/licence" This reverts commit f2f13d1, reversing changes made to 0f054d0. * Revert "Merge pull request #4 from lambda-feedback/feature/licence" This reverts commit 0f054d0, reversing changes made to 33c6e64. * Revert "Merge pull request #3 from lambda-feedback/feature/licence" This reverts commit 33c6e64, reversing changes made to d634719. * Revert "Merge pull request #2 from lambda-feedback/feature/licence" This reverts commit d634719, reversing changes made to 3e56ecb. * Revert "Merge pull request #1 from lambda-feedback/feature/licence" This reverts commit 3e56ecb, reversing changes made to 1801b08. * Revert "Removed redudant flag" This reverts commit c5febdb. * Revert
1 parent 905ac33 commit 0b857b1

File tree

2 files changed

+1
-41
lines changed

2 files changed

+1
-41
lines changed

.github/workflows/deploy.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ on:
4747
build-secrets:
4848
description: "The Docker secrets to use for the build"
4949
required: false
50-
LICENSE:
51-
description: "The licence file to bundle into the ECR image"
52-
required: false
5350

5451
jobs:
5552
setup:
@@ -112,7 +109,6 @@ jobs:
112109
aws-key-id: ${{ secrets.aws-key-id }}
113110
aws-secret-key: ${{ secrets.aws-secret-key }}
114111
build-secrets: ${{ secrets.build-secrets }}
115-
license: ${{ secrets.LICENSE }}
116112

117113
deploy-staging:
118114
uses: ./.github/workflows/lambda_deploy.yml

.github/workflows/lambda_build.yml

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,11 @@ on:
5353
build-secrets:
5454
description: "The Docker secrets to use for the build"
5555
required: false
56-
LICENSE:
57-
description: "The licence file to bundle into the ECR image"
58-
required: false
5956
outputs:
6057
registry:
6158
description: "The registry where the image was pushed"
6259
value: ${{ jobs.build.outputs.registry }}
6360

64-
6561
jobs:
6662
build:
6763
name: Build (${{ inputs.environment }})
@@ -72,8 +68,6 @@ jobs:
7268
id-token: write
7369
outputs:
7470
registry: ${{ steps.login-ecr.outputs.registry }}
75-
env:
76-
LICENSE: ${{ secrets.LICENSE }}
7771
steps:
7872
- name: Checkout
7973
uses: actions/checkout@v4
@@ -112,37 +106,7 @@ jobs:
112106
- name: Set up Docker Buildx
113107
uses: docker/setup-buildx-action@v3
114108

115-
- name: Write license file if secret exists
116-
run: |
117-
if [ -n "${{ secrets.LICENSE }}" ]; then
118-
mkdir ./dist/
119-
echo "${{ secrets.LICENSE }}" > ./dist/LICENSE.txt
120-
echo "License file created at ./dist/LICENSE.txt"
121-
ls ./dist
122-
else
123-
echo "LICENSE_TEXT secret not provided. Skipping license file creation."
124-
fi
125-
126-
127-
- name: Build and push with licence
128-
if: ${{ env.LICENSE != '' }}
129-
uses: docker/build-push-action@v6
130-
with:
131-
file: ${{ inputs.build-file || 'Dockerfile' }}
132-
context: ${{ inputs.build-context || '.'}}
133-
target: with-license
134-
push: ${{ inputs.build-push }}
135-
provenance: false
136-
tags: ${{ steps.meta.outputs.tags }}
137-
labels: ${{ steps.meta.outputs.labels }}
138-
cache-from: type=gha
139-
cache-to: type=gha,mode=max,ignore-error=true
140-
platforms: ${{ inputs.build-platforms }}
141-
build-args: ${{ inputs.build-args }}
142-
secrets: ${{ secrets.build-secrets }}
143-
144-
- name: Build and push without licence
145-
if: ${{ env.LICENSE != '' }}
109+
- name: Build and push
146110
uses: docker/build-push-action@v6
147111
with:
148112
file: ${{ inputs.build-file || 'Dockerfile' }}

0 commit comments

Comments
 (0)