From da7a87d3917463a8464cd32567ecb0c102d4bf34 Mon Sep 17 00:00:00 2001
From: Hayden Young <hi@hbjy.dev>
Date: Fri, 15 Oct 2021 13:49:55 +0000
Subject: fix: make API dockerfile use correct setup steps

---
 api/Dockerfile | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

(limited to 'api')

diff --git a/api/Dockerfile b/api/Dockerfile
index 08d15f72..78256be6 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,12 +1,28 @@
 FROM node:lts-alpine
+
 # needed for native packages (bcrypt, canvas)
-RUN apk add --no-cache make gcc g++ python cairo-dev jpeg-dev pango-dev giflib-dev
-WORKDIR /usr/src/fosscord-server
-COPY package.json .
-COPY package-lock.json .
-RUN npm rebuild bcrypt --build-from-source && npm install canvas --build-from-source
+RUN apk add --no-cache \
+    make \
+    gcc \
+    g++ \
+    python \
+    cairo-dev \
+    jpeg-dev \
+    pango-dev \
+    giflib-dev
+
+WORKDIR /usr/src/fosscord-api
+
+RUN npm rebuild bcrypt --build-from-source \
+    && npm install canvas --build-from-source
+
+COPY api/package.json api/package-lock.json ./
+COPY util ../util
 RUN npm install
-COPY . .
+
+COPY api/ .
+
+RUN npm run build
+
 EXPOSE 3001
-RUN npm run build-docker
 CMD ["node", "dist/start.js"]
-- 
cgit 1.5.1


From 22f185b1f531583e0c11e5bf3887a20522f7c083 Mon Sep 17 00:00:00 2001
From: Hayden Young <hi@hbjy.dev>
Date: Fri, 15 Oct 2021 14:01:52 +0000
Subject: fix: update source paths

---
 api/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'api')

diff --git a/api/Dockerfile b/api/Dockerfile
index 78256be6..dbe21e15 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:lts-alpine
+FROM node:lts-alpine AS builder
 
 # needed for native packages (bcrypt, canvas)
 RUN apk add --no-cache \
@@ -11,14 +11,14 @@ RUN apk add --no-cache \
     pango-dev \
     giflib-dev
 
-WORKDIR /usr/src/fosscord-api
+WORKDIR /usr/src/api
 
 RUN npm rebuild bcrypt --build-from-source \
     && npm install canvas --build-from-source
 
 COPY api/package.json api/package-lock.json ./
 COPY util ../util
-RUN npm install
+RUN cd ../util && npm install && cd ../api && npm install
 
 COPY api/ .
 
-- 
cgit 1.5.1