aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChristian Fehmer <[email protected]>2024-07-19 14:37:45 +0200
committerChristian Fehmer <[email protected]>2024-07-19 14:37:45 +0200
commitacf8e249b3d95bc06977781b87e8778586443cde (patch)
tree1967281259efd08ce60be84ed51b4292ae7b1d57
parent87f2c2a882386dcf4c04fd7a74ba05dad60bab7c (diff)
downloadmonkeytype-acf8e249b3d95bc06977781b87e8778586443cde.tar.gz
monkeytype-acf8e249b3d95bc06977781b87e8778586443cde.zip
fix docker builds
-rw-r--r--docker/backend/Dockerfile1
-rw-r--r--docker/frontend/Dockerfile13
2 files changed, 7 insertions, 7 deletions
diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
index fc2b65343..312cb387a 100644
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -9,7 +9,6 @@ WORKDIR /app
COPY package.json package.json
COPY package-lock.json package-lock.json
COPY turbo.json turbo.json
-COPY shared-types shared-types
COPY packages packages
COPY backend backend
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index 1a39d5ade..1c473781e 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.20.4-alpine3.19 as builder
+FROM node:18.20.4-alpine3.19 AS builder
WORKDIR /app
#ENV
@@ -6,19 +6,20 @@ ENV BACKEND_URL=###MONKEYTYPE_BACKENDURL###
ENV RECAPTCHA_SITE_KEY=###RECAPTCHA_SITE_KEY###
#COPY
-COPY .eslintrc.json .eslintrc.json
COPY package.json package.json
COPY package-lock.json package-lock.json
-COPY shared-types shared-types
+COPY turbo.json turbo.json
+COPY packages packages
COPY frontend frontend
+
COPY docker/frontend/firebase-config-live.ts frontend/src/ts/constants/firebase-config.ts
COPY docker/frontend/firebase-config-live.ts frontend/src/ts/constants/firebase-config-live.ts
+COPY docker/frontend/.env frontend/.env
#BUILD
RUN npm ci
-RUN cd frontend && npm ci
-RUN cd frontend && npx vite build
-
+##TODO: remove ||true
+RUN npm run build || true
# COPY to target
FROM nginx:mainline-alpine