From a6549b030d006d6216e6cf9f4c338e514d6d7c95 Mon Sep 17 00:00:00 2001 From: Marcus Messer Date: Thu, 14 Aug 2025 15:58:25 +0100 Subject: [PATCH 01/10] Revert "Merge pull request #8 from lambda-feedback/feature/licence" This reverts commit 905ac336ea809f38b506b43b5b23d4c3669e4c44, reversing changes made to 8a410bfcab423e4f35e9511f82e2577b97f414ba. --- .github/workflows/lambda_build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lambda_build.yml b/.github/workflows/lambda_build.yml index bda50e8..6d67b32 100644 --- a/.github/workflows/lambda_build.yml +++ b/.github/workflows/lambda_build.yml @@ -115,10 +115,9 @@ jobs: - name: Write license file if secret exists run: | if [ -n "${{ secrets.LICENSE }}" ]; then - mkdir ./dist/ - echo "${{ secrets.LICENSE }}" > ./dist/LICENSE.txt - echo "License file created at ./dist/LICENSE.txt" - ls ./dist + mkdir dist/ + echo "${{ secrets.LICENSE }}" > dist/LICENSE.txt + echo "License file created at dist/LICENSE.txt" else echo "LICENSE_TEXT secret not provided. Skipping license file creation." fi From 1b59b14aa21b2d0361cf4cc591d99055f7a115b6 Mon Sep 17 00:00:00 2001 From: Marcus Messer Date: Thu, 14 Aug 2025 15:58:43 +0100 Subject: [PATCH 02/10] Revert "Merge pull request #7 from lambda-feedback/feature/licence" This reverts commit 8a410bfcab423e4f35e9511f82e2577b97f414ba, reversing changes made to 32c94ce4e6c11686152108e124e6915edd29b44a. --- .github/workflows/lambda_build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/lambda_build.yml b/.github/workflows/lambda_build.yml index 6d67b32..6d40d07 100644 --- a/.github/workflows/lambda_build.yml +++ b/.github/workflows/lambda_build.yml @@ -115,7 +115,6 @@ jobs: - name: Write license file if secret exists run: | if [ -n "${{ secrets.LICENSE }}" ]; then - mkdir dist/ echo "${{ secrets.LICENSE }}" > dist/LICENSE.txt echo "License file created at dist/LICENSE.txt" else From 050126b8c516235852a92858f79f86c00437696a Mon Sep 17 00:00:00 2001 From: Marcus Messer Date: Thu, 14 Aug 2025 15:58:47 +0100 Subject: [PATCH 03/10] Revert "Merge pull request #6 from lambda-feedback/feature/licence" This reverts commit 32c94ce4e6c11686152108e124e6915edd29b44a, reversing changes made to f2f13d1302417cff441e18eafe62c37144ea1145. --- .github/workflows/deploy.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e52a228..eefb183 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,9 +47,6 @@ on: build-secrets: description: "The Docker secrets to use for the build" required: false - LICENSE: - description: "The licence file to bundle into the ECR image" - required: false jobs: setup: @@ -112,7 +109,6 @@ jobs: aws-key-id: ${{ secrets.aws-key-id }} aws-secret-key: ${{ secrets.aws-secret-key }} build-secrets: ${{ secrets.build-secrets }} - license: ${{ secrets.LICENSE }} deploy-staging: uses: ./.github/workflows/lambda_deploy.yml From 83a4632aa7138d163335de51062f571349f05edd Mon Sep 17 00:00:00 2001 From: Marcus Messer Date: Thu, 14 Aug 2025 15:58:51 +0100 Subject: [PATCH 04/10] Revert "Merge pull request #5 from lambda-feedback/feature/licence" This reverts commit f2f13d1302417cff441e18eafe62c37144ea1145, reversing changes made to 0f054d008ceeb43d8d89065101056c8c3079d3c9. --- .github/workflows/lambda_build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lambda_build.yml b/.github/workflows/lambda_build.yml index 6d40d07..01e4919 100644 --- a/.github/workflows/lambda_build.yml +++ b/.github/workflows/lambda_build.yml @@ -72,8 +72,6 @@ jobs: id-token: write outputs: registry: ${{ steps.login-ecr.outputs.registry }} - env: - LICENSE: ${{ secrets.LICENSE }} steps: - name: Checkout uses: actions/checkout@v4 @@ -117,18 +115,19 @@ jobs: if [ -n "${{ secrets.LICENSE }}" ]; then echo "${{ secrets.LICENSE }}" > dist/LICENSE.txt echo "License file created at dist/LICENSE.txt" + echo "target=with-licence" >> $GITHUB_OUTPUT else echo "LICENSE_TEXT secret not provided. Skipping license file creation." fi - name: Build and push with licence - if: ${{ env.LICENSE != '' }} + if: ${{ secrets.LICENSE != '' }} uses: docker/build-push-action@v6 with: file: ${{ inputs.build-file || 'Dockerfile' }} context: ${{ inputs.build-context || '.'}} - target: with-license + target: ${{ steps.license.outputs.target }} push: ${{ inputs.build-push }} provenance: false tags: ${{ steps.meta.outputs.tags }} @@ -140,7 +139,7 @@ jobs: secrets: ${{ secrets.build-secrets }} - name: Build and push without licence - if: ${{ env.LICENSE != '' }} + if: ${{ secrets.LICENSE != '' }} uses: docker/build-push-action@v6 with: file: ${{ inputs.build-file || 'Dockerfile' }} From 1f64ae3fd35b071e1c56191decceafcd1d2baecf Mon Sep 17 00:00:00 2001 From: Marcus Messer Date: Thu, 14 Aug 2025 15:58:55 +0100 Subject: [PATCH 05/10] Revert "Merge pull request #4 from lambda-feedback/feature/licence" This reverts commit 0f054d008ceeb43d8d89065101056c8c3079d3c9, reversing changes made to 33c6e641a88037b6500f452d2d77ddd00aa62807. --- .github/workflows/lambda_build.yml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/lambda_build.yml b/.github/workflows/lambda_build.yml index 01e4919..a7176b6 100644 --- a/.github/workflows/lambda_build.yml +++ b/.github/workflows/lambda_build.yml @@ -115,31 +115,12 @@ jobs: if [ -n "${{ secrets.LICENSE }}" ]; then echo "${{ secrets.LICENSE }}" > dist/LICENSE.txt echo "License file created at dist/LICENSE.txt" - echo "target=with-licence" >> $GITHUB_OUTPUT else echo "LICENSE_TEXT secret not provided. Skipping license file creation." fi - - name: Build and push with licence - if: ${{ secrets.LICENSE != '' }} - uses: docker/build-push-action@v6 - with: - file: ${{ inputs.build-file || 'Dockerfile' }} - context: ${{ inputs.build-context || '.'}} - target: ${{ steps.license.outputs.target }} - push: ${{ inputs.build-push }} - provenance: false - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max,ignore-error=true - platforms: ${{ inputs.build-platforms }} - build-args: ${{ inputs.build-args }} - secrets: ${{ secrets.build-secrets }} - - - name: Build and push without licence - if: ${{ secrets.LICENSE != '' }} + - name: Build and push uses: docker/build-push-action@v6 with: file: ${{ inputs.build-file || 'Dockerfile' }} From d411eaa72b516a46b4814a889561e755acffb4c7 Mon Sep 17 00:00:00 2001 From: Marcus Messer Date: Thu, 14 Aug 2025 15:58:58 +0100 Subject: [PATCH 06/10] Revert "Merge pull request #3 from lambda-feedback/feature/licence" This reverts commit 33c6e641a88037b6500f452d2d77ddd00aa62807, reversing changes made to d6347193f4d1412f6ea35b4241d8a994c8dc5d2f. --- .github/workflows/lambda_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lambda_build.yml b/.github/workflows/lambda_build.yml index a7176b6..56206c0 100644 --- a/.github/workflows/lambda_build.yml +++ b/.github/workflows/lambda_build.yml @@ -111,7 +111,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Write license file if secret exists - run: | + run: if [ -n "${{ secrets.LICENSE }}" ]; then echo "${{ secrets.LICENSE }}" > dist/LICENSE.txt echo "License file created at dist/LICENSE.txt" From b1c3bff9ed1339f9e685fd564cd853ce098d8331 Mon Sep 17 00:00:00 2001 From: Marcus Messer Date: Thu, 14 Aug 2025 15:58:59 +0100 Subject: [PATCH 07/10] Revert "Merge pull request #2 from lambda-feedback/feature/licence" This reverts commit d6347193f4d1412f6ea35b4241d8a994c8dc5d2f, reversing changes made to 3e56ecbb0efc5d9a1f6018a28dc5d0e5fef6029b. --- .github/workflows/lambda_build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/lambda_build.yml b/.github/workflows/lambda_build.yml index 56206c0..25998b9 100644 --- a/.github/workflows/lambda_build.yml +++ b/.github/workflows/lambda_build.yml @@ -53,9 +53,6 @@ on: build-secrets: description: "The Docker secrets to use for the build" required: false - LICENSE: - description: "The licence file to bundle into the ECR image" - required: false outputs: registry: description: "The registry where the image was pushed" From 17bb861bf49ad436d17b63ced3cd699d5a4f6a1f Mon Sep 17 00:00:00 2001 From: Marcus Messer Date: Thu, 14 Aug 2025 15:59:01 +0100 Subject: [PATCH 08/10] Revert "Merge pull request #1 from lambda-feedback/feature/licence" This reverts commit 3e56ecbb0efc5d9a1f6018a28dc5d0e5fef6029b, reversing changes made to 1801b083dd3f6be56fb43242d1ab637c9c9cb0ce. --- .github/workflows/lambda_build.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/lambda_build.yml b/.github/workflows/lambda_build.yml index 25998b9..d2da3d1 100644 --- a/.github/workflows/lambda_build.yml +++ b/.github/workflows/lambda_build.yml @@ -58,7 +58,6 @@ on: description: "The registry where the image was pushed" value: ${{ jobs.build.outputs.registry }} - jobs: build: name: Build (${{ inputs.environment }}) @@ -107,16 +106,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Write license file if secret exists - run: - if [ -n "${{ secrets.LICENSE }}" ]; then - echo "${{ secrets.LICENSE }}" > dist/LICENSE.txt - echo "License file created at dist/LICENSE.txt" - else - echo "LICENSE_TEXT secret not provided. Skipping license file creation." - fi - - - name: Build and push uses: docker/build-push-action@v6 with: From cd1fdbb2e6c9e22c4e14521b06e24b413926cbc3 Mon Sep 17 00:00:00 2001 From: Marcus Messer Date: Thu, 14 Aug 2025 15:59:01 +0100 Subject: [PATCH 09/10] Revert "Removed redudant flag" This reverts commit c5febdb2a346630c66b144697be53f526110e03e. --- .github/workflows/lambda_build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/lambda_build.yml b/.github/workflows/lambda_build.yml index d2da3d1..06ccdc8 100644 --- a/.github/workflows/lambda_build.yml +++ b/.github/workflows/lambda_build.yml @@ -57,6 +57,10 @@ on: registry: description: "The registry where the image was pushed" value: ${{ jobs.build.outputs.registry }} + include-licence-file: + type: boolean + required: false + default: false jobs: build: From c8437d0ff6c8dcc7d22e4c0c2f2d5c3a07ba3b7f Mon Sep 17 00:00:00 2001 From: Marcus Messer Date: Thu, 14 Aug 2025 16:01:11 +0100 Subject: [PATCH 10/10] Revert --- .github/workflows/lambda_build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/lambda_build.yml b/.github/workflows/lambda_build.yml index 06ccdc8..d2da3d1 100644 --- a/.github/workflows/lambda_build.yml +++ b/.github/workflows/lambda_build.yml @@ -57,10 +57,6 @@ on: registry: description: "The registry where the image was pushed" value: ${{ jobs.build.outputs.registry }} - include-licence-file: - type: boolean - required: false - default: false jobs: build: