Merge pull request dotnet-architecture#1 from CESARDELATORRE/glennc

some initial dockerfiles and catalog work. Proof of concept more than…

Author: glennc

.gitignore

@@ -250,3 +250,4 @@ paket-files/
 # JetBrains Rider
 .idea/
 *.sln.iml
+pub/

NuGet.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
+    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+</configuration>

build.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+#dotnet restore
+rm -rf ./pub
+dotnet publish "$(pwd)/src/Services/Catalog/Catalog.API/project.json" -o "$(pwd)/pub/catalog"
+dotnet publish "$(pwd)/src/Web/Microsoft.eShopOnContainers.WebMVC/project.json" -o "$(pwd)/pub/webMVC"
+
+docker build -t eshop/web "$(pwd)/pub/webMVC"
+docker build -t eshop/catalog.api "$(pwd)/pub/catalog"

docker-compose.yml

@@ -0,0 +1,21 @@
+version: '2'
+
+services:
+  webmvc:
+    image: eshop/web
+    environment:
+      - CatalogUrl=http://catalog.api
+    ports:
+      - "80:80"
+    depends_on:
+      - catalog.api
+  catalog.api:
+    image: eshop/catalog.api
+    environment:
+      - ConnectionString=Server=catalogdata;Port=5432;Database=postgres;username=postgres
+    expose:
+      - "80"
+    depends_on:
+      - catalogdata
+  catalogdata:
+    image: glennc/eshopdata

eShopOnContainers.sln

@@ -7,7 +7,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3AF739CD-81D8-428D-A08A-0A58372DEBF6}"
 	ProjectSection(SolutionItems) = preProject
+		docker-compose.yml = docker-compose.yml
 		global.json = global.json
+		NuGet.config = NuGet.config
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{91CF7717-08AB-4E65-B10E-0B426F01E2E8}"

src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
+
+namespace Microsoft.eShopOnContainers.Services.Catalog.API.Controllers
+{
+    [Route("/")]
+    public class CatalogController : ControllerBase
+    {
+        private CatalogContext _context;
+
+        public CatalogController(CatalogContext context)
+        {
+            _context = context;
+        }
+
+        // GET api/values
+        [HttpGet]
+        public IEnumerable<CatalogItem> Get()
+        {
+            return _context.CatalogItems.ToList();
+        }
+
+        // GET api/values/5
+        [HttpGet("{id}")]
+        public IActionResult Get(Guid id)
+        {
+            var item = _context.CatalogItems.FirstOrDefault(x=> x.Id == id);
+
+            if(item == null)
+            {
+                return NotFound();
+            }
+
+            return new OkObjectResult(item);
+        }
+
+        // POST api/values
+        [HttpPost]
+        public IActionResult Post([FromBody]CatalogItem item)
+        {
+            try
+            {
+                _context.CatalogItems.Add(item);
+                _context.SaveChanges();
+                return Ok();
+            }
+            catch
+            {
+                return StatusCode(500, "Unable to add new catalog item");
+            }
+        }
+
+        // PUT api/values/5
+        [HttpPut("{id}")]
+        public IActionResult Put(int id, [FromBody]CatalogItem item)
+        {
+            _context.CatalogItems.Update(item);
+            _context.SaveChanges();
+            return Ok();
+        }
+
+        // DELETE api/values/5
+        [HttpDelete("{id}")]
+        public IActionResult Delete(Guid id)
+        {
+            return Ok();
+        }
+    }
+}

src/Services/Catalog/Catalog.API/Controllers/ValuesController.cs

@@ -0,0 +1,5 @@
+FROM microsoft/aspnetcore
+WORKDIR /app
+EXPOSE 80
+ADD . /app
+ENTRYPOINT dotnet Catalog.API.dll

src/Services/Catalog/Catalog.API/Dockerfile

@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore;
+using Npgsql.EntityFrameworkCore.PostgreSQL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.Services.Catalog.API.Model
+{
+    public class CatalogContext : DbContext
+    {
+        public CatalogContext(DbContextOptions options): base(options)
+        {
+        }
+
+        public DbSet<CatalogItem> CatalogItems { get; set; }
+
+        protected override void OnModelCreating(ModelBuilder builder)
+        {
+            builder.HasPostgresExtension("uuid-ossp");
+        }
+    }
+}

src/Services/Catalog/Catalog.API/Model/CatalogContext.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.Services.Catalog.API.Model
+{
+    public class CatalogItem
+    {
+        public CatalogItem()
+        {
+        }
+
+        public Guid Id { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public decimal Price { get; set; }
+        public int ImageCount { get; set; }
+    }
+}