diff --git a/Dockerfile b/Dockerfile index 303de3b6..36dc75a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,6 @@ COPY appsettings.json . EXPOSE 8080 ENTRYPOINT [ "/usr/src/app/BuildBot" ] - + # Perform a healthcheck. note that ECS ignores this, so this is for local development HEALTHCHECK --interval=5s --timeout=2s --retries=3 --start-period=5s CMD [ "/usr/src/app/BuildBot", "--health-check", "http://127.0.0.1:8080/ping?source=docker" ] diff --git a/README.md b/README.md index 3d7bcfd1..bffde88a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ FunFair's Build Discord Bot -## Build Status: +## Build Status | Branch | Status | |--------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| @@ -11,5 +11,3 @@ FunFair's Build Discord Bot ## Changelog View [changelog](CHANGELOG.md) - - diff --git a/cloudformation.json b/cloudformation.json index f98d6993..5952389e 100644 --- a/cloudformation.json +++ b/cloudformation.json @@ -69,10 +69,6 @@ "Type": "Number", "Default": "200" }, - "AwsContainerRegistry": { - "Type": "String", - "Default": "117769150821.dkr.ecr.eu-west-1.amazonaws.com" - }, "SecretsManagerArn": { "Type": "String", "Default": "arn:aws:secretsmanager:eu-west-1:117769150821:secret:BuildBot-ph1YIJ" @@ -85,7 +81,7 @@ "Version": { "Ref": "ApplicationVersion" } - }, + }, "Resources": { "TaskDefinition": { "Type": "AWS::ECS::TaskDefinition", @@ -297,6 +293,8 @@ }, "LogGroup": { "Type": "AWS::Logs::LogGroup", + "DeletionPolicy": "Delete", + "UpdateReplacePolicy": "Delete", "Properties": { "LogGroupName": { "Fn::Sub": ["/ecs/${Path}/", { "Path": { "Ref": "ApplicationName" } }] @@ -344,7 +342,7 @@ } ] }, - "DependsOn": ["TaskDefinition", "TargetGroup", "ListenerRule"] + "DependsOn": ["ListenerRule"] }, "TargetGroup": { "Type": "AWS::ElasticLoadBalancingV2::TargetGroup", @@ -398,8 +396,7 @@ ], "ListenerArn": { "Ref": "LoadBalancerArn" }, "Priority": { "Ref": "LoadBalancerPriority" } - }, - "DependsOn": ["TargetGroup"] + } } } } diff --git a/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj b/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj index ec0493de..960b0cfd 100644 --- a/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj +++ b/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj @@ -69,4 +69,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj b/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj index 33424c10..ab53e08f 100644 --- a/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj +++ b/src/BuildBot.CloudFormation/BuildBot.CloudFormation.csproj @@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj b/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj index c63ed28c..09ea2964 100644 --- a/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj +++ b/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj @@ -70,4 +70,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.Discord/BuildBot.Discord.csproj b/src/BuildBot.Discord/BuildBot.Discord.csproj index 86535fe9..f5a688ce 100644 --- a/src/BuildBot.Discord/BuildBot.Discord.csproj +++ b/src/BuildBot.Discord/BuildBot.Discord.csproj @@ -72,4 +72,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj b/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj index b3926e77..62a88934 100644 --- a/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj +++ b/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj @@ -70,4 +70,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.GitHub/BuildBot.GitHub.csproj b/src/BuildBot.GitHub/BuildBot.GitHub.csproj index aef83c6b..66301e0b 100644 --- a/src/BuildBot.GitHub/BuildBot.GitHub.csproj +++ b/src/BuildBot.GitHub/BuildBot.GitHub.csproj @@ -59,4 +59,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj b/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj index e5d322cd..cff4deb7 100644 --- a/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj +++ b/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj @@ -69,4 +69,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.Health/BuildBot.Health.csproj b/src/BuildBot.Health/BuildBot.Health.csproj index 0b88c6b4..d6afcc99 100644 --- a/src/BuildBot.Health/BuildBot.Health.csproj +++ b/src/BuildBot.Health/BuildBot.Health.csproj @@ -62,4 +62,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj b/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj index 9ce694cc..ce501b09 100644 --- a/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj +++ b/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj @@ -69,4 +69,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.Json/BuildBot.Json.csproj b/src/BuildBot.Json/BuildBot.Json.csproj index 229e4df7..f1816fda 100644 --- a/src/BuildBot.Json/BuildBot.Json.csproj +++ b/src/BuildBot.Json/BuildBot.Json.csproj @@ -59,4 +59,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj b/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj index 104ca80c..22983e59 100644 --- a/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj +++ b/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj @@ -69,4 +69,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj b/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj index 07a2553d..df7b05b3 100644 --- a/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj +++ b/src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj @@ -60,4 +60,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.Tests/BuildBot.Tests.csproj b/src/BuildBot.Tests/BuildBot.Tests.csproj index 5e3a583d..d9aae190 100644 --- a/src/BuildBot.Tests/BuildBot.Tests.csproj +++ b/src/BuildBot.Tests/BuildBot.Tests.csproj @@ -70,4 +70,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj b/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj index 7f5fc99c..1c84a2b7 100644 --- a/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj +++ b/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj @@ -69,4 +69,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot.Watchtower/BuildBot.Watchtower.csproj b/src/BuildBot.Watchtower/BuildBot.Watchtower.csproj index aef83c6b..66301e0b 100644 --- a/src/BuildBot.Watchtower/BuildBot.Watchtower.csproj +++ b/src/BuildBot.Watchtower/BuildBot.Watchtower.csproj @@ -59,4 +59,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot/BuildBot.csproj b/src/BuildBot/BuildBot.csproj index 984c86df..804ec655 100644 --- a/src/BuildBot/BuildBot.csproj +++ b/src/BuildBot/BuildBot.csproj @@ -131,4 +131,4 @@ - \ No newline at end of file + diff --git a/src/BuildBot/MinimalApi.http b/src/BuildBot/MinimalApi.http index e8f09578..0fe8d77a 100644 --- a/src/BuildBot/MinimalApi.http +++ b/src/BuildBot/MinimalApi.http @@ -568,4 +568,4 @@ User-Agent: AWS "Signature" : "EXAMPLElDMXvB8r9R83tGoNn0ecwd5UjllzsvSvbItzfaMpN2nk5HVSw7XnOn/49IkxDKz8YrlH2qJXj2iZB0Zo2O71c4qQk1fMUDi3LGpij7RCW7AW9vYYsSqIKRnFS94ilu7NFhUzLiieYr4BKHpdTmdD6c0esKEYBpabxDSc=", "SigningCertURL" : "https://sns.us-west-2.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem", "UnsubscribeURL" : "https://sns.us-west-2.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-west-2:123456789012:MyTopic:2bcfbf39-05c3-41de-beaa-fcfcc21c8f55" -} \ No newline at end of file +} diff --git a/src/publish b/src/publish index 2d5c44da..2311d10d 100755 --- a/src/publish +++ b/src/publish @@ -58,4 +58,3 @@ echo "Clear $OUTFOLDER" \ -e "SERVEROCTOPUS__APIKEY=example" \ -it \ --rm "funfair/buildbot:latest" - \ No newline at end of file