Skip to content
This repository has been archived by the owner on Dec 8, 2024. It is now read-only.

Commit

Permalink
Merge pull request #35 from troy-ameigh/main
Browse files Browse the repository at this point in the history
Updated to fix Python issue, Bucket retention, Exclude issue and dockerfile issue fo…
  • Loading branch information
troy-ameigh authored Apr 12, 2024
2 parents 1ebd831 + ea1e864 commit 8e4bb84
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 1 addition & 5 deletions .project_automation/static_tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
FROM public.ecr.aws/codebuild/amazonlinux2-x86_64-standard:4.0
RUN git clone https://github.com/aws-quickstart/qs-cfn-lint-rules.git /tmp/qs-cfn-lint-rules
<<<<<<< before updating
RUN cd /tmp/qs-cfn-lint-rules && git checkout 8268db9df3407ccf5383def635bc22e0f99d6b39 && pip install .
#RUN cfn-lint -u
=======
RUN cd /tmp/qs-cfn-lint-rules && pip install .
>>>>>>> after updating
#RUN cfn-lint -u
8 changes: 6 additions & 2 deletions templates/git2s3.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Parameters:
Type: String
Default: ''
ExcludeGit:
Description: Choose False to omit the .git directory from the Git repository .zip file.
Description: Choose True to omit the .git directory from the Git repository .zip file.
Type: String
Default: 'True'
AllowedValues: ['True', 'False']
Expand Down Expand Up @@ -146,6 +146,8 @@ Conditions:
Resources:
LambdaZipsBucket:
Type: AWS::S3::Bucket
DeletionPolicy: Retain
UpdateReplacePolicy: Retain
Properties:
BucketEncryption:
ServerSideEncryptionConfiguration:
Expand Down Expand Up @@ -220,7 +222,7 @@ Resources:
Properties:
Description: Copies objects from a source S3 bucket to a destination.
Handler: index.handler
Runtime: python3.7
Runtime: python3.9
Role: !GetAtt 'CopyZipsRole.Arn'
Timeout: 240
Code:
Expand Down Expand Up @@ -285,6 +287,8 @@ Resources:

KeyBucket:
Type: AWS::S3::Bucket
DeletionPolicy: Retain
UpdateReplacePolicy: Retain
Properties:
Tags: []
BucketEncryption:
Expand Down

0 comments on commit 8e4bb84

Please sign in to comment.