Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start of the new user layer: client, daemon, registries #497

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 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
25 changes: 25 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
**/.classpath
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/bin
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
LICENSE
README.md
31 changes: 31 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs

###############################
# Core EditorConfig Options #
###############################

root = true

# All files
[*]
indent_style = space

# Code files
[*.cs]
indent_size = 4
insert_final_newline = true
charset = utf-8-bom

# Dockerfiles
[Dockerfile]
indent_size = 2

# YAML
[*.yml]
indent_size = 2

# Scripts
[*.ps1]
indent_size = 4
insert_final_newline = true
charset = utf-8-bom
73 changes: 73 additions & 0 deletions CodeMaid.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Configuration for the CodeMaid extension. IIRC, these are all the default values.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this should be part of the repository, I use codemaid extension and have a local .editorconfig myself but wouldn't commit it, same as I wouldn't commit my local color theme preferences
I may be wrong on this, this is my first time as contributor and is is taking time to learn some contributor etiquette

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get where you're coming from, and certainly settings that only affect developers at an individual level shouldn't be checked in. .editorconfig can certainly be used to help make one's code consistent, but I think it's primarily meant to declare a team's desired conventions. It's no fun to open a project and find a thousand warnings because another author has broader variance. Committing an .editorconfig sets the baseline so everyone can build the code without warnings.

CodeMaid is much farther into the gray area. On further reflection, I agree that it shouldn't be checked in for OSS projects. I'll remove it.

<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="SteveCadwallader.CodeMaid.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</sectionGroup>
</configSections>
<userSettings>
<SteveCadwallader.CodeMaid.Properties.Settings>
<setting name="Cleaning_ExclusionExpression" serializeAs="String">
<value>\.Designer\.cs$||\.Designer\.vb$||\.resx$||\.min\.css$||\.min\.js$||\.generated\.cs$||\.generated\.vb$</value>
</setting>
<setting name="Cleaning_InsertEndOfFileTrailingNewLine" serializeAs="String">
<value>True</value>
</setting>
<setting name="Cleaning_RemoveEndOfFileTrailingNewLine" serializeAs="String">
<value>False</value>
</setting>
<setting name="Formatting_CommentRunDuringCleanup" serializeAs="String">
<value>True</value>
</setting>
<setting name="Reorganizing_MemberTypeStructs" serializeAs="String">
<value>Structs||7||Structs + Enums + Classes + Interfaces</value>
</setting>
<setting name="Reorganizing_MemberTypeConstructors" serializeAs="String">
<value>Constructors||1||Constructors</value>
</setting>
<setting name="Reorganizing_MemberTypeMethods" serializeAs="String">
<value>Methods||6||Methods</value>
</setting>
<setting name="Reorganizing_MemberTypeProperties" serializeAs="String">
<value>Properties||4||Properties + Indexers</value>
</setting>
<setting name="Reorganizing_MemberTypeEnums" serializeAs="String">
<value>Enums||7||Structs + Enums + Classes + Interfaces</value>
</setting>
<setting name="Reorganizing_MemberTypeDestructors" serializeAs="String">
<value>Destructors||8||Destructors</value>
</setting>
<setting name="Reorganizing_MemberTypeDelegates" serializeAs="String">
<value>Delegates||2||Delegates</value>
</setting>
<setting name="Reorganizing_MemberTypeIndexers" serializeAs="String">
<value>Indexers||4||Properties + Indexers</value>
</setting>
<setting name="Reorganizing_MemberTypeClasses" serializeAs="String">
<value>Classes||7||Structs + Enums + Classes + Interfaces</value>
</setting>
<setting name="Reorganizing_MemberTypeFields" serializeAs="String">
<value>Fields||5||Fields</value>
</setting>
<setting name="Reorganizing_MemberTypeInterfaces" serializeAs="String">
<value>Interfaces||7||Structs + Enums + Classes + Interfaces</value>
</setting>
<setting name="Reorganizing_MemberTypeEvents" serializeAs="String">
<value>Events||3||Events</value>
</setting>
<setting name="Reorganizing_PerformWhenPreprocessorConditionals"
serializeAs="String">
<value>1</value>
</setting>
<setting name="Reorganizing_RunAtStartOfCleanup" serializeAs="String">
<value>True</value>
</setting>
<setting name="Formatting_CommentWrapColumn" serializeAs="String">
<value>120</value>
</setting>
<setting name="Formatting_CommentSkipWrapOnLastWord" serializeAs="String">
<value>False</value>
</setting>
</SteveCadwallader.CodeMaid.Properties.Settings>
</userSettings>
</configuration>
39 changes: 37 additions & 2 deletions Docker.DotNet.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.9
# Visual Studio Version 16
VisualStudioVersion = 16.0.30804.86
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{85990620-78A6-4381-8BD6-84E6D0CF0649}"
EndProject
Expand All @@ -15,6 +15,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docker.DotNet.X509", "src\D
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docker.DotNet.Tests", "test\Docker.DotNet.Tests\Docker.DotNet.Tests.csproj", "{248C5D51-2B33-4A06-A0EA-AA709F752E52}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DockerSdk", "src\DockerSdk\DockerSdk.csproj", "{2E0D6ACC-A935-465E-ADD3-E06A6A426408}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DockerSdk.Tests", "test\DockerSdk.Tests\DockerSdk.Tests.csproj", "{94D3A9F4-36DD-4104-8919-621C3B2ECB99}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3FC99294-813B-450A-9DD2-7D3126B17A55}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -73,6 +79,30 @@ Global
{248C5D51-2B33-4A06-A0EA-AA709F752E52}.Release|x64.Build.0 = Release|Any CPU
{248C5D51-2B33-4A06-A0EA-AA709F752E52}.Release|x86.ActiveCfg = Release|Any CPU
{248C5D51-2B33-4A06-A0EA-AA709F752E52}.Release|x86.Build.0 = Release|Any CPU
{2E0D6ACC-A935-465E-ADD3-E06A6A426408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2E0D6ACC-A935-465E-ADD3-E06A6A426408}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E0D6ACC-A935-465E-ADD3-E06A6A426408}.Debug|x64.ActiveCfg = Debug|Any CPU
{2E0D6ACC-A935-465E-ADD3-E06A6A426408}.Debug|x64.Build.0 = Debug|Any CPU
{2E0D6ACC-A935-465E-ADD3-E06A6A426408}.Debug|x86.ActiveCfg = Debug|Any CPU
{2E0D6ACC-A935-465E-ADD3-E06A6A426408}.Debug|x86.Build.0 = Debug|Any CPU
{2E0D6ACC-A935-465E-ADD3-E06A6A426408}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E0D6ACC-A935-465E-ADD3-E06A6A426408}.Release|Any CPU.Build.0 = Release|Any CPU
{2E0D6ACC-A935-465E-ADD3-E06A6A426408}.Release|x64.ActiveCfg = Release|Any CPU
{2E0D6ACC-A935-465E-ADD3-E06A6A426408}.Release|x64.Build.0 = Release|Any CPU
{2E0D6ACC-A935-465E-ADD3-E06A6A426408}.Release|x86.ActiveCfg = Release|Any CPU
{2E0D6ACC-A935-465E-ADD3-E06A6A426408}.Release|x86.Build.0 = Release|Any CPU
{94D3A9F4-36DD-4104-8919-621C3B2ECB99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{94D3A9F4-36DD-4104-8919-621C3B2ECB99}.Debug|Any CPU.Build.0 = Debug|Any CPU
{94D3A9F4-36DD-4104-8919-621C3B2ECB99}.Debug|x64.ActiveCfg = Debug|Any CPU
{94D3A9F4-36DD-4104-8919-621C3B2ECB99}.Debug|x64.Build.0 = Debug|Any CPU
{94D3A9F4-36DD-4104-8919-621C3B2ECB99}.Debug|x86.ActiveCfg = Debug|Any CPU
{94D3A9F4-36DD-4104-8919-621C3B2ECB99}.Debug|x86.Build.0 = Debug|Any CPU
{94D3A9F4-36DD-4104-8919-621C3B2ECB99}.Release|Any CPU.ActiveCfg = Release|Any CPU
{94D3A9F4-36DD-4104-8919-621C3B2ECB99}.Release|Any CPU.Build.0 = Release|Any CPU
{94D3A9F4-36DD-4104-8919-621C3B2ECB99}.Release|x64.ActiveCfg = Release|Any CPU
{94D3A9F4-36DD-4104-8919-621C3B2ECB99}.Release|x64.Build.0 = Release|Any CPU
{94D3A9F4-36DD-4104-8919-621C3B2ECB99}.Release|x86.ActiveCfg = Release|Any CPU
{94D3A9F4-36DD-4104-8919-621C3B2ECB99}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -82,5 +112,10 @@ Global
{E1F24B25-E027-45E0-A6E1-E08138F1F95D} = {85990620-78A6-4381-8BD6-84E6D0CF0649}
{89BD76AD-78C9-4E4A-96A2-E5DA6D4AFA44} = {85990620-78A6-4381-8BD6-84E6D0CF0649}
{248C5D51-2B33-4A06-A0EA-AA709F752E52} = {AA4B8CC2-1431-4FC7-9DF3-533EC6C86D3A}
{2E0D6ACC-A935-465E-ADD3-E06A6A426408} = {85990620-78A6-4381-8BD6-84E6D0CF0649}
{94D3A9F4-36DD-4104-8919-621C3B2ECB99} = {AA4B8CC2-1431-4FC7-9DF3-533EC6C86D3A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2FB3FE97-BC33-411B-92BB-69801DD461D1}
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions src/Docker.DotNet/DockerClientConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class DockerClientConfiguration : IDisposable

public TimeSpan NamedPipeConnectTimeout { get; set; } = TimeSpan.FromMilliseconds(100);

private static Uri LocalDockerUri()
public static Uri LocalDockerUri()
{
var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
return isWindows ? new Uri("npipe://./pipe/docker_engine") : new Uri("unix:/var/run/docker.sock");
Expand Down Expand Up @@ -59,4 +59,4 @@ public void Dispose()
Credentials.Dispose();
}
}
}
}
123 changes: 123 additions & 0 deletions src/DockerSdk/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs

###############################
# Core EditorConfig Options #
###############################

# inherited

###############################
# .NET Coding Conventions #
###############################

[*.cs]

# Organize usings
dotnet_sort_system_directives_first = true
# this. preferences
dotnet_style_qualification_for_field = false:silent
dotnet_style_qualification_for_property = false:silent
dotnet_style_qualification_for_method = false:silent
dotnet_style_qualification_for_event = false:silent
# Language keywords vs BCL types preferences
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
dotnet_style_predefined_type_for_member_access = true:silent
# Parentheses preferences
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
# Modifier preferences
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
dotnet_style_readonly_field = true:suggestion
# Expression-level preferences
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_auto_properties = true:silent
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent

###############################
# Naming Conventions #
###############################

# Style Definitions
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
# Use PascalCase for constant fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
dotnet_naming_symbols.constant_fields.applicable_kinds = field
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
dotnet_naming_symbols.constant_fields.required_modifiers = const

###############################
# C# Coding Conventions #
###############################

[*.cs]

# var preferences
csharp_style_var_for_built_in_types = true:silent
csharp_style_var_when_type_is_apparent = true:silent
csharp_style_var_elsewhere = true:silent
# Expression-bodied members
csharp_style_expression_bodied_methods = false:silent
csharp_style_expression_bodied_constructors = false:silent
csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_properties = true:silent
csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_accessors = true:silent
# Pattern matching preferences
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
# Null-checking preferences
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion
# Modifier preferences
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
# Expression-level preferences
csharp_prefer_braces = true:silent
csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_prefer_simple_default_expression = true:suggestion
csharp_style_pattern_local_over_anonymous_function = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion

###############################
# C# Formatting Rules #
###############################

# New line preferences
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_between_query_expression_clauses = true
# Indentation preferences
csharp_indent_case_contents = true
csharp_indent_switch_labels = true
csharp_indent_labels = flush_left
# Space preferences
csharp_space_after_cast = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_around_binary_operators = before_and_after
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
# Wrapping preferences
csharp_preserve_single_line_statements = true
csharp_preserve_single_line_blocks = true

20 changes: 20 additions & 0 deletions src/DockerSdk/CertificateLoader.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using System.Security.Cryptography.X509Certificates;

namespace DockerSdk
{
internal static class CertificateLoader
{
/// <summary>
/// Loads certificates from a file.
/// </summary>
/// <param name="path">The file to load from.</param>
/// <returns>The resultant collection of certificates.</returns>
/// <exception cref="CryptographicException">The file did not represent a valid certificate.</exception>
public static X509Certificate2Collection Load(string path)
{
var collection = new X509Certificate2Collection();
collection.Import(path);
return collection;
}
}
}
Loading