Try fix app docker image (#13)

tix-factory · Mar 18, 2023 · 8e046a4 · 8e046a4
1 parent b3af134
commit 8e046a4
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 28 deletions.
diff --git a/.do/app.yaml b/.do/app.yaml
@@ -16,7 +16,7 @@ services:
     github:
       branch: 'main'
       deploy_on_push: true
-      repo: 'tix-factory/push-notifications-demo'
+      repo: 'tix-factory/push-notifications'
     health_check:
       http_path: '/health'
     http_port: 80
@@ -34,7 +34,7 @@ static_sites:
     github:
       branch: 'main'
       deploy_on_push: true
-      repo: 'tix-factory/push-notifications-demo'
+      repo: 'tix-factory/push-notifications'
     source_dir: 'services/app'
     output_dir: 'build'
     build_command: 'npm run build'

diff --git a/libs/js/push-notifications/package-lock.json b/libs/js/push-notifications/package-lock.json
diff --git a/libs/js/push-notifications/package.json b/libs/js/push-notifications/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "build": "tsc"
   },
-  "dependencies": {
+  "peerDependencies": {
     "@types/react": "^18.0.28",
     "react": "^18.2.0"
   },

diff --git a/services/api/Directory.Build.props b/services/api/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup Label="AssemblyMetadata">
     <Company>Tix Factory</Company>
-    <RepositoryUrl>https://github.com/tix-factory/push-notifications-demo</RepositoryUrl>
+    <RepositoryUrl>https://github.com/tix-factory/push-notifications</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 

diff --git a/services/api/src/Controllers/PushNotificationsController.cs b/services/api/src/Controllers/PushNotificationsController.cs
@@ -161,7 +161,7 @@ public async Task<ActionResult> SendPushNotification(CancellationToken cancellat
             Title = "Hello, world!",
             Message = "This notification was sent using the push API.",
             Link = new Uri("https://demo.push-notifications.app?notification_clicked=true"),
-            ButtonLink = new Uri("https://github.com/tix-factory/push-notifications-demo/issues"),
+            ButtonLink = new Uri("https://github.com/tix-factory/push-notifications/issues"),
             Icon = new Uri("https://cdn.jsdelivr.net/gh/twitter/twemoji@v14.0.2/assets/72x72/1f514.png")
         };
 

diff --git a/services/app/Dockerfile b/services/app/Dockerfile
@@ -1,20 +1,27 @@
 # Setup runtime images
 FROM node:19 AS base
 
-# Setup build image
-FROM node:19 AS build
+# Setup image to build the published module with
+FROM node:19 AS build-module
 
-# Copy files over
-COPY ./services/app ./services/app
+# Copy the files over
 COPY ./libs/js ./libs/js
 
-# Install the module packages
+# Install the packages
 WORKDIR /libs/js/push-notifications
 RUN npm ci
 
 # Build the module
 RUN npm run build
 
+# Setup build image
+FROM node:19 AS build
+
+# Copy files over
+COPY --from=build-module /libs/js/push-notifications/dist /libs/js/push-notifications/dist
+COPY --from=build-module /libs/js/push-notifications/package.json /libs/js/push-notifications/package.json
+COPY ./services/app ./services/app
+
 # Install the packages
 WORKDIR /services/app
 RUN npm ci

diff --git a/services/app/package-lock.json b/services/app/package-lock.json