Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

FunFair's Build Discord Bot

## Build Status:
## Build Status

| Branch | Status |
|--------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
Expand All @@ -11,5 +11,3 @@ FunFair's Build Discord Bot
## Changelog

View [changelog](CHANGELOG.md)


13 changes: 5 additions & 8 deletions cloudformation.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -85,7 +81,7 @@
"Version": {
"Ref": "ApplicationVersion"
}
},
},
"Resources": {
"TaskDefinition": {
"Type": "AWS::ECS::TaskDefinition",
Expand Down Expand Up @@ -297,6 +293,8 @@
},
"LogGroup": {
"Type": "AWS::Logs::LogGroup",
"DeletionPolicy": "Delete",
"UpdateReplacePolicy": "Delete",
"Properties": {
"LogGroupName": {
"Fn::Sub": ["/ecs/${Path}/", { "Path": { "Ref": "ApplicationName" } }]
Expand Down Expand Up @@ -344,7 +342,7 @@
}
]
},
"DependsOn": ["TaskDefinition", "TargetGroup", "ListenerRule"]
"DependsOn": ["ListenerRule"]
},
"TargetGroup": {
"Type": "AWS::ElasticLoadBalancingV2::TargetGroup",
Expand Down Expand Up @@ -398,8 +396,7 @@
],
"ListenerArn": { "Ref": "LoadBalancerArn" },
"Priority": { "Ref": "LoadBalancerPriority" }
},
"DependsOn": ["TargetGroup"]
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="xunit.analyzers" Version="1.27.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="xunit.analyzers" Version="1.27.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot.Discord/BuildBot.Discord.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="xunit.analyzers" Version="1.27.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot.GitHub/BuildBot.GitHub.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="xunit.analyzers" Version="1.27.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot.Health/BuildBot.Health.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="xunit.analyzers" Version="1.27.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot.Json/BuildBot.Json.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="xunit.analyzers" Version="1.27.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot.ServiceModel/BuildBot.ServiceModel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot.Tests/BuildBot.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="xunit.analyzers" Version="1.27.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="xunit.analyzers" Version="1.27.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot.Watchtower/BuildBot.Watchtower.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot/BuildBot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-xcx6-vp38-8hr5" />
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-xw6w-9jjh-p9cr" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/BuildBot/MinimalApi.http
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
1 change: 0 additions & 1 deletion src/publish
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,3 @@ echo "Clear $OUTFOLDER" \
-e "SERVEROCTOPUS__APIKEY=example" \
-it \
--rm "funfair/buildbot:latest"

Loading