From b91f76c9ceda52a417e5a833fdbd45df64cadc85 Mon Sep 17 00:00:00 2001 From: BillMills Date: Sat, 22 Jun 2019 13:06:31 -0400 Subject: [PATCH] mssql->postgres --- bulletin-board-app/package.json | 4 +++- bulletin-board-db/Dockerfile | 11 +++-------- bulletin-board-db/init-db.sql | 20 -------------------- 3 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 bulletin-board-db/init-db.sql diff --git a/bulletin-board-app/package.json b/bulletin-board-app/package.json index a36a40a..2fcdb1f 100644 --- a/bulletin-board-app/package.json +++ b/bulletin-board-app/package.json @@ -15,7 +15,9 @@ "tedious": "^2.0.1", "sequelize": "^4.20.1", "prom-client": "^10.2.2", - "winston": "3.2.1" + "winston": "3.2.1", + "pg": "^7.0.0", + "pg-hstore": "^2.3.3" }, "devDependencies": { "body-parser": "^1.14.1", diff --git a/bulletin-board-db/Dockerfile b/bulletin-board-db/Dockerfile index e5b3c8f..56d6065 100644 --- a/bulletin-board-db/Dockerfile +++ b/bulletin-board-db/Dockerfile @@ -1,10 +1,5 @@ -FROM microsoft/mssql-server-linux:2017-CU13 +FROM postgres:9.6 -ENV ACCEPT_EULA=Y \ - MSSQL_SA_PASSWORD=DockerCon!!! +ENV MSSQL_SA_PASSWORD=DockerCon!!! -WORKDIR /init -COPY init-db.* ./ - -RUN chmod +x ./init-db.sh -RUN /opt/mssql/bin/sqlservr & ./init-db.sh \ No newline at end of file +COPY init-db.sh /docker-entrypoint-initdb.d/init-db.sh \ No newline at end of file diff --git a/bulletin-board-db/init-db.sql b/bulletin-board-db/init-db.sql deleted file mode 100644 index 7ea5f58..0000000 --- a/bulletin-board-db/init-db.sql +++ /dev/null @@ -1,20 +0,0 @@ -CREATE DATABASE BulletinBoard; -GO - -USE BulletinBoard; - -CREATE TABLE Events ( - Id INT IDENTITY(1,1) NOT NULL PRIMARY KEY, - Title NVARCHAR(50), - Detail NVARCHAR(200), - [Date] DATETIMEOFFSET, - CreatedAt DATETIMEOFFSET NOT NULL, - UpdatedAt DATETIMEOFFSET NOT NULL -); - -INSERT INTO Events (Title, Detail, [Date], CreatedAt, UpdatedAt) VALUES -(N'Docker for Beginners', N'Introduction to Docker using Node.js', '2017-11-21', GETDATE(), GETDATE()), -(N'Advanced Orchestration', N'Deep dive into Docker Swarm', '2017-12-25', GETDATE(), GETDATE()), -(N'Docker on Windows', N'From 101 to production', '2018-01-01', GETDATE(), GETDATE()); - -SELECT * FROM BulletinBoard.dbo.Events; \ No newline at end of file