diff --git a/_includes/docker_platform_matrix.md b/_includes/docker_platform_matrix.md index c953f209f2..c5ddf2f384 100644 --- a/_includes/docker_platform_matrix.md +++ b/_includes/docker_platform_matrix.md @@ -1,6 +1,5 @@ {% capture green-check %}{: style="height: 14px"}{% endcapture %} -{% capture matrix %} | Platform | Docker EE | Docker CE x86_64 | Docker CE ARM | | ---------------------------------------------------------------------------------------------------- | ----------------- | ----------------- | ----------------- | | [Ubuntu](/engine/installation/linux/ubuntu.md) | {{ green-check }} | {{ green-check }} | {{ green-check }} | @@ -16,6 +15,3 @@ | [Microsoft Azure](/docker-for-azure/) | {{ green-check }} | {{ green-check }} | | | [Amazon Web Services](/docker-for-aws/) | {{ green-check }} | {{ green-check }} | | {: style="width: 75%" } - -{% endcapture %} -{{ matrix | markdownify }} \ No newline at end of file diff --git a/_layouts/docs.html b/_layouts/docs.html index e9452d5ba4..47bc3272c0 100644 --- a/_layouts/docs.html +++ b/_layouts/docs.html @@ -63,6 +63,7 @@ else %}{% assign edit_url = "" %}{% endif %} {% break %} {% endif %} {% endfor % + @@ -192,10 +193,12 @@ else %}{% assign edit_url = "" %}{% endif %} {% break %} {% endif %} {% endfor % {% include footer.html %} + {% if page.highlightjs == true %} + {% endif %} diff --git a/_scss/_content.scss b/_scss/_content.scss index 36e48ca599..0008a53685 100755 --- a/_scss/_content.scss +++ b/_scss/_content.scss @@ -129,10 +129,9 @@ pre { font-size: 13px; line-height: 1.42857143; color: #333; - word-break: normal!important; - word-wrap: break-word; + word-break: normal!important; + word-wrap: break-word; background-color: #f5f5f5; border: 1px solid #ccc; border-radius: 4px; - overflow-x: scroll!important; } diff --git a/_scss/_navigation.scss b/_scss/_navigation.scss index d0195f4be5..28bf1975fe 100755 --- a/_scss/_navigation.scss +++ b/_scss/_navigation.scss @@ -172,7 +172,6 @@ margin: 0; padding: 0 60px 0 0; width: 300px; - line-height: 24px; li { padding: 2px 8px 2px 15px; float: left; @@ -180,7 +179,7 @@ a { display: block; font-size: 12px; - padding: 0 10px 0 10px; + padding: 5px; text-decoration: none; } } diff --git a/compose/aspnet-mssql-compose.md b/compose/aspnet-mssql-compose.md index fa4b9b74b1..ac6e1b4c70 100644 --- a/compose/aspnet-mssql-compose.md +++ b/compose/aspnet-mssql-compose.md @@ -1,5 +1,5 @@ --- -description: Create a Docker Compose application using ASP.NET Core and SQL Server on Linux in Docker. +description: Create a Docker Compose application using ASP.NET Core and SQL Server on Linux in Docker. keywords: dotnet, .NET, Core, example, ASP.NET Core, SQL Server, mssql title: "Quickstart: Compose and ASP.NET Core with SQL Server" --- @@ -27,7 +27,7 @@ configure this app to use our SQL Server database, and then create a This directory will be the context of your docker-compose project. For [Docker for Windows](https://docs.docker.com/docker-for-windows/#/shared-drives) and [Docker for Mac](https://docs.docker.com/docker-for-mac/#/file-sharing), you - have to set up file sharing for the volume that you need to map. + have to set up file sharing for the volume that you need to map. 1. Within your directory, use the `aspnetcore-build` Docker image to generate a sample web application within the container under the `/app` directory and @@ -37,12 +37,12 @@ configure this app to use our SQL Server database, and then create a $ docker run -v ${PWD}:/app --workdir /app microsoft/aspnetcore-build:lts dotnet new mvc --auth Individual ``` - > **Note**: If running in Docker for Windows, make sure to use Powershell + > **Note**: If running in Docker for Windows, make sure to use Powershell or specify the absolute path of your app directory. 1. Create a `Dockerfile` within your app directory and add the following content: - ```dockerfile + ```conf FROM microsoft/aspnetcore-build:lts COPY . /app WORKDIR /app @@ -88,20 +88,18 @@ configure this app to use our SQL Server database, and then create a 1. Create a `docker-compose.yml` file. Write the following in the file, and make sure to replace the password in the `SA_PASSWORD` environment variable under `db` below. This file will define the way the images will interact as - independent services. + independent services. > **Note**: The SQL Server container requires a secure password to startup: > Minimum length 8 characters, including uppercase and lowercase letters, > base 10 digits and/or non-alphanumeric symbols. - ```none - - version: '3' - + ```yaml + version: "3" services: web: build: . - ports: + ports: - "8000:80" depends_on: - db @@ -126,7 +124,7 @@ configure this app to use our SQL Server database, and then create a [...] public void ConfigureServices(IServiceCollection services) { - // Database connection string. + // Database connection string. // Make sure to update the Password value below from "your_password" to your actual password. var connection = @"Server=db;Database=master;User=sa;Password=your_password;"; @@ -147,7 +145,7 @@ configure this app to use our SQL Server database, and then create a } [...] ``` - + 1. Ready! You can now run the `docker-compose build` command. ```bash diff --git a/css/pygments/perldoc.css b/css/pygments/perldoc.css new file mode 100755 index 0000000000..c64e6bba6d --- /dev/null +++ b/css/pygments/perldoc.css @@ -0,0 +1,67 @@ +/* +.highlight .hll { background-color: #ffffcc } +.highlight { background: #eeeedd } */ +.highlight .c { color: #228B22 } /* Comment */ +.highlight .err { color: #a61717 } /* Error */ +.highlight .k { color: #8B008B } /* Keyword */ +.highlight .ch { color: #228B22 } /* Comment.Hashbang */ +.highlight .cm { color: #228B22 } /* Comment.Multiline */ +.highlight .cp { color: #1e889b } /* Comment.Preproc */ +.highlight .cpf { color: #228B22 } /* Comment.PreprocFile */ +.highlight .c1 { color: #228B22 } /* Comment.Single */ +.highlight .cs { color: #8B008B } /* Comment.Special */ +.highlight .gd { color: #aa0000 } /* Generic.Deleted */ +.highlight .ge { font-style: italic } /* Generic.Emph */ +.highlight .gr { color: #aa0000 } /* Generic.Error */ +.highlight .gh { color: #000080 } /* Generic.Heading */ +.highlight .gi { color: #00aa00 } /* Generic.Inserted */ +.highlight .go { color: #888888 } /* Generic.Output */ +.highlight .gp { color: #555555 } /* Generic.Prompt */ +.highlight .gs {} /* Generic.Strong */ +.highlight .gu { color: #800080 } /* Generic.Subheading */ +.highlight .gt { color: #aa0000 } /* Generic.Traceback */ +.highlight .kc { color: #8B008B } /* Keyword.Constant */ +.highlight .kd { color: #8B008B } /* Keyword.Declaration */ +.highlight .kn { color: #8B008B } /* Keyword.Namespace */ +.highlight .kp { color: #8B008B } /* Keyword.Pseudo */ +.highlight .kr { color: #8B008B } /* Keyword.Reserved */ +.highlight .kt { color: #00688B } /* Keyword.Type */ +.highlight .m { color: #B452CD } /* Literal.Number */ +.highlight .s { color: #CD5555 } /* Literal.String */ +.highlight .na { color: #658b00 } /* Name.Attribute */ +.highlight .nb { color: #658b00 } /* Name.Builtin */ +.highlight .nc { color: #008b45 } /* Name.Class */ +.highlight .no { color: #00688B } /* Name.Constant */ +.highlight .nd { color: #707a7c } /* Name.Decorator */ +.highlight .ne { color: #008b45 } /* Name.Exception */ +/*.highlight .nf { color: #008b45 } Name.Function */ +.highlight .nn { color: #008b45 } /* Name.Namespace */ +.highlight .nt { color: #8B008B } /* Name.Tag */ +.highlight .nv { color: #00688B } /* Name.Variable */ +.highlight .ow { color: #8B008B } /* Operator.Word */ +.highlight .w { color: #bbbbbb } /* Text.Whitespace */ +.highlight .mb { color: #B452CD } /* Literal.Number.Bin */ +.highlight .mf { color: #B452CD } /* Literal.Number.Float */ +.highlight .mh { color: #B452CD } /* Literal.Number.Hex */ +.highlight .mi { color: #B452CD } /* Literal.Number.Integer */ +.highlight .mo { color: #B452CD } /* Literal.Number.Oct */ +.highlight .sa { color: #CD5555 } /* Literal.String.Affix */ +.highlight .sb { color: #CD5555 } /* Literal.String.Backtick */ +.highlight .sc { color: #CD5555 } /* Literal.String.Char */ +.highlight .dl { color: #CD5555 } /* Literal.String.Delimiter */ +.highlight .sd { color: #CD5555 } /* Literal.String.Doc */ +.highlight .s2 { color: #CD5555 } /* Literal.String.Double */ +.highlight .se { color: #CD5555 } /* Literal.String.Escape */ +.highlight .sh { color: #1c7e71 } /* Literal.String.Heredoc */ +.highlight .si { color: #CD5555 } /* Literal.String.Interpol */ +.highlight .sx { color: #cb6c20 } /* Literal.String.Other */ +.highlight .sr { color: #1c7e71 } /* Literal.String.Regex */ +.highlight .s1 { color: #CD5555 } /* Literal.String.Single */ +.highlight .ss { color: #CD5555 } /* Literal.String.Symbol */ +.highlight .bp { color: #658b00 } /* Name.Builtin.Pseudo */ +.highlight .fm { color: #008b45 } /* Name.Function.Magic */ +.highlight .vc { color: #00688B } /* Name.Variable.Class */ +.highlight .vg { color: #00688B } /* Name.Variable.Global */ +.highlight .vi { color: #00688B } /* Name.Variable.Instance */ +.highlight .vm { color: #00688B } /* Name.Variable.Magic */ +.highlight .il { color: #B452CD } /* Literal.Number.Integer.Long */ diff --git a/datacenter/dtr/2.2/guides/admin/configure/use-a-load-balancer.md b/datacenter/dtr/2.2/guides/admin/configure/use-a-load-balancer.md index a6bac25e1e..a65e4bb6f4 100644 --- a/datacenter/dtr/2.2/guides/admin/configure/use-a-load-balancer.md +++ b/datacenter/dtr/2.2/guides/admin/configure/use-a-load-balancer.md @@ -70,7 +70,7 @@ queried, and it takes the form: "replica id": "2006-01-02T15:04:05Z07:00", "another replica id": "2006-01-02T15:04:05Z07:00" }, - // other fields + "(other fields go here)": "..." } ``` @@ -94,10 +94,8 @@ Use the following examples to configure your load balancer for DTR.
-{% capture basics %} -### Learn the basics of Docker - -The basic tutorial introduces Docker concepts, tools, and commands. The examples show you how to build, push, -and pull Docker images, and run them as containers. This -tutorial stops short of teaching you how to deploy applications. -{% endcapture %}{{ basics | markdownify }} - | -- -{% capture apps %} -### Define and deploy applications - -The define-and-deploy tutorial shows how to relate -containers to each other and define them as services in an application that is ready to deploy at scale in a -production environment. Highlights [Compose Version 3 new features](/engine/getstarted-voting-app/index.md#compose-version-3-features-and-compatibility) and swarm mode. -{% endcapture %}{{ apps | markdownify }} - - |
{% capture basics %}[Start the basic tutorial](/engine/getstarted/){: class="button primary-btn"}{% endcapture %}{{ basics | markdownify }} - | -{% capture apps %}[Start the application tutorial](/engine/getstarted-voting-app/){: class="button primary-btn"}{% endcapture %}{{ apps | markdownify }} - | -
A native application using the macOS sandbox security model which delivers all Docker tools to your Mac.
-A native Windows application which delivers all Docker tools to your Windows computer.
-Install Docker on a computer which already has a Linux distribution installed.
-Create Docker images and run Docker containers. As of v1.12.0, Engine includes swarm mode container orchestration features.
-A hosted service for building, testing, and deploying Docker images to your hosts.
-(UCP) Manage a cluster of on-premises Docker hosts as if they were a single machine.
-Define applications built using multiple containers.
-A hosted registry service for managing and building images.
-(DTR) stores and signs your images.
-Automate container provisioning on your network or in the cloud. Available for Windows, macOS, or Linux.
--{% capture basics %} + | ## Learn the basics of Docker The basic tutorial introduces Docker concepts, tools, and commands. The examples show you how to build, push, and pull Docker images, and run them as containers. This tutorial stops short of teaching you how to deploy applications. -{% endcapture %}{{ basics | markdownify }} | -- -{% capture apps %} + | ## Define and deploy applications The define-and-deploy tutorial shows how to relate containers to each other and define them as services in an application that is ready to deploy at scale in a production environment. Highlights Compose Version 3 new features and swarm mode. -{% endcapture %}{{ apps | markdownify }} - |
-{% capture basics %} + | [Start the basic tutorial](/engine/getstarted/){: class="button primary-btn"} -{% endcapture %}{{ basics | markdownify }} | --{% capture apps %} + | [Start the application tutorial](/engine/getstarted-voting-app/){: class="button primary-btn"} -{% endcapture %}{{ apps | markdownify }} |