From 1f2822597b63c82ab453f5750c105a228c2dc75e Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Mon, 18 Oct 2021 14:36:57 +0200
Subject: Revert "fix: make API dockerfile use correct setup steps"

This reverts commit da7a87d3917463a8464cd32567ecb0c102d4bf34.
---
 api/Dockerfile | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

(limited to 'api/Dockerfile')

diff --git a/api/Dockerfile b/api/Dockerfile
index 41c9363b..08d15f72 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,29 +1,12 @@
-FROM node:lts-alpine AS builder
-
+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/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 cd ../util && npm install && cd ../api && npm install
-
-COPY api/ .
-
-RUN npm run build
-
+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 npm install
+COPY . .
 EXPOSE 3001
-
+RUN npm run build-docker
 CMD ["node", "dist/start.js"]
-- 
cgit 1.4.1