From ded2e756eb8bda1c0cbcd0d0fc54202cb2b6df4c Mon Sep 17 00:00:00 2001
From: MysticBoy <mysticboy@live.com>
Date: Wed, 11 Mar 2020 20:17:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=20=E4=BF=AE=E6=94=B9docker-compose=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Clients/CoAPClient/CoAPClient.csproj      |  55 ------
 .../Clients/CoAPClient/NuGetUpgradeLog.html   | 162 ------------------
 .../Clients/CoAPClient/packages.config        |   4 -
 docker-compose.override.yml                   |   4 +-
 docker-compose.yml                            |  21 ++-
 5 files changed, 20 insertions(+), 226 deletions(-)
 delete mode 100644 MigrationBackup/4f889639/Clients/CoAPClient/CoAPClient.csproj
 delete mode 100644 MigrationBackup/4f889639/Clients/CoAPClient/NuGetUpgradeLog.html
 delete mode 100644 MigrationBackup/4f889639/Clients/CoAPClient/packages.config

diff --git a/MigrationBackup/4f889639/Clients/CoAPClient/CoAPClient.csproj b/MigrationBackup/4f889639/Clients/CoAPClient/CoAPClient.csproj
deleted file mode 100644
index 485a9dc7..00000000
--- a/MigrationBackup/4f889639/Clients/CoAPClient/CoAPClient.csproj
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{EE801BD6-5757-4A55-BC94-7FBA6E98F393}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>CoAPClient</RootNamespace>
-    <AssemblyName>CoAPClient</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="CoAP.NET, Version=1.1.0.0, Culture=neutral, PublicKeyToken=e2c10a743037308b, processorArchitecture=MSIL">
-      <HintPath>..\packages\CoAP.1.1.0\lib\net40\CoAP.NET.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="readme.md" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/MigrationBackup/4f889639/Clients/CoAPClient/NuGetUpgradeLog.html b/MigrationBackup/4f889639/Clients/CoAPClient/NuGetUpgradeLog.html
deleted file mode 100644
index f9b7e210..00000000
--- a/MigrationBackup/4f889639/Clients/CoAPClient/NuGetUpgradeLog.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html>
-<!-- saved from url=(0014)about:internet -->
-
-    <html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="NuGetUpgradeReportTitle">
-          NuGetMigrationLog
-        </title><style>
-            
-                    /* Body style, for the entire document */
-                    body
-                    {
-                        background: #F3F3F4;
-                        color: #1E1E1F;
-                        font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
-                        font-size: 12pt;
-                        padding: 0;
-                        margin: 0;
-                    }
-
-                    /* Header1 style, used for the main title */
-                    h1
-                    {
-                        padding: 10px 0px 10px 10px;
-                        font-size: 21pt;
-                        background-color: #E2E2E2;
-                        border-bottom: 1px #C1C1C2 solid; 
-                        color: #201F20;
-                        margin: 0;
-                        font-weight: normal;
-                    }
-
-                    /* Header2 style, used for "Overview" and other sections */
-                    h2
-                    {
-                        font-size: 18pt;
-                        font-weight: normal;
-                        padding: 15px 0 5px 0;
-                        margin: 0;
-                    }
-
-                    /* Header3 style, used for sub-sections, such as project name */
-                    h3
-                    {
-                        font-weight: normal;
-                        font-size: 15pt;
-                        margin: 0;
-                        padding: 15px 0 5px 0;
-                        background-color: transparent;
-                    }
-
-                    .info-text
-                    {
-                        margin: 0px 0 0.75em 0;
-                    }
-
-                    /* Color all hyperlinks one color */
-                    a
-                    {
-                        color: #1382CE;
-                    }
-
-                    /* Table styles */ 
-                    table
-                    {
-                        border-spacing: 0 0;
-                        border-collapse: collapse;
-                        font-size: 11pt;
-                    }
-
-                    table th
-                    {
-                        background: #E7E7E8;
-                        text-align: left;
-                        text-decoration: none;
-                        font-weight: normal;
-                        padding: 3px 6px 3px 6px;
-                    }
-
-                    table td
-                    {
-                        vertical-align: top;
-                        padding: 3px 6px 5px 5px;
-                        margin: 0px;
-                        border: 1px solid #E7E7E8;
-                        background: #F7F7F8;
-                    }
-
-                    /* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
-                    .localLink
-                    {
-                        color: #1E1E1F;
-                        background: #EEEEED;
-                        text-decoration: none;
-                    }
-
-                    .localLink:hover
-                    {
-                        color: #1382CE;
-                        background: #FFFF99;
-                        text-decoration: none;
-                    }
-
-                    .issueCell
-                    {
-                        width: 100%;
-                    }
-
-                    .packageIssue
-                    {
-                        margin-left: 25px;
-                    }
-
-                    /* Padding around the content after the h1 */ 
-                    #content 
-                    {
-	                    padding: 0px 20px 20px 20px; 
-                    }
-
-                    .issues table
-                    {
-                        width: 97%;
-                    }
-
-                    /* All Icons */
-                    .IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
-                    {
-                        min-width:18px;
-                        min-height:18px; 
-                        background-repeat:no-repeat;
-                        background-position:center;
-                    }
-
-                    .IconSuccessEncoded
-                    {
-                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
-                    }
-
-                    .IconInfoEncoded
-                    {
-                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
-                    }
-
-                    .IconWarningEncoded
-                    {
-                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
-                    }
-
-                    .IconErrorEncoded
-                    {
-                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
-                    }
-                
-          </style></head><body><h1>
-          NuGet Migration Report - Clients\CoAPClient</h1><div id="content"><h2 _locID="OverviewTitle">Overview</h2><div class="info-text">Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.</div><div class="info-text">
-            If you run into any problems, have feedback, questions, or concerns, please
-            <a href="https://github.com/NuGet/Home/issues/">file an issue on the NuGet GitHub repository.</a></div><div class="info-text">
-            Changed files and this report have been backed up here:
-            <a href="D:\GitHub\IoTSharp\IoTSharp\MigrationBackup\4f889639\Clients\CoAPClient">D:\GitHub\IoTSharp\IoTSharp\MigrationBackup\4f889639\Clients\CoAPClient</a></div><div class="info-text"><a href="https://aka.ms/nuget-pc2pr-migrator-rollback">Help me rollback to packages.config</a></div><h2 _locID="PackagesTitle">Packages processed</h2><h3 _locID="IncludePackagesTitle">Top-level dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell"><span>CoAP</span></td><td><span>
-                v1.1.0</span></td></tr></table></div><p /><h3 _locID="IncludePackagesTitle">Transitive dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell">
-                No transitive dependencies found.
-              </td><td /></tr></table></div><h2 _locID="IssuesTitle">Package compatibility issues</h2><div class="issues"><table><tr><th /><th class="issueCell" _locID="DescriptionTableHeader">Description</th></tr><tr><td class="IconInfoEncoded" /><td class="issueCell">
-                No issues were found.
-              </td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/MigrationBackup/4f889639/Clients/CoAPClient/packages.config b/MigrationBackup/4f889639/Clients/CoAPClient/packages.config
deleted file mode 100644
index a5adf87b..00000000
--- a/MigrationBackup/4f889639/Clients/CoAPClient/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CoAP" version="1.1.0" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 5d3746b2..ed5b91f4 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -4,9 +4,9 @@ services:
   iotsharp:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=https://+:443;http://+:80
+      - ASPNETCORE_URLS=https://+:443;http://+:8080
     ports:
-      - "80"
+      - "8080"
       - "443"
     volumes:
       - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
diff --git a/docker-compose.yml b/docker-compose.yml
index 56974e5e..f32ba7f4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     container_name: pgsql
     restart: always
     volumes:
-      -  /dbdata/postgresql:/var/lib/postgresql/data 
+      -  /var/iotsharp/postgresql:/var/lib/postgresql/data 
     environment:
       TZ: "Asia/Shanghai"
       POSTGRES_USER: postgres
@@ -15,13 +15,13 @@ services:
      - "5432:5432"
     networks:
       - iotsharp-network
-  
+
   pgadmin:
     image: dpage/pgadmin4
     container_name: pgadmin
     restart: always
     volumes:
-       - "./servers.json:/pgadmin4/servers.json"
+       - "/etc/iotsharp/servers.json:/pgadmin4/servers.json"
     depends_on:
       - pgsql 
     links:
@@ -32,8 +32,23 @@ services:
       PGADMIN_DEFAULT_PASSWORD: "1-q2-w3-e4-r5-t"
     networks:
       - iotsharp-network
+
   iotsharp:
     image: ${DOCKER_REGISTRY-}iotsharp
+    depends_on:
+      - pgsql
+    links:
+      - pgsql 
+    volumes:
+      - "/etc/iotsharp/appsettings.Production.json:/app/appsettings.Production.json"
+    ports:
+      - 80:8080
+    networks:
+      - iotsharp-network
     build:
       context: .
       dockerfile: IoTSharp/Dockerfile
+
+networks: 
+  iotsharp-network:
+      driver:  bridge
\ No newline at end of file
-- 
GitLab