From 5718a4f147246f1f7bf7af1ebc71c246f290a0c1 Mon Sep 17 00:00:00 2001 From: Michael Schramm Date: Wed, 3 Jun 2020 11:21:52 +0200 Subject: [PATCH] remove dependencies from other images and use gitmodules for docker build --- Dockerfile | 28 ++++++++++++++++++++++++---- api | 2 +- ui | 2 +- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a81ae6f4..c54bbc74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,29 @@ -FROM ohmyform/ui as builder +FROM node:12 as builder +WORKDIR /usr/src/app + +COPY ui/ . + +RUN yarn install --frozen-lockfile RUN yarn export -FROM ohmyform/api - +FROM node:12 LABEL maintainer="OhMyForm " -COPY --from=builder /usr/src/app/out /usr/src/app/public +WORKDIR /usr/src/app + +COPY api/ . + +RUN yarn install --frozen-lockfile +RUN yarn build + +ENV PORT=3000 \ + SECRET_KEY=ChangeMe \ + CREATE_ADMIN=FALSE \ + ADMIN_EMAIL=admin@ohmyform.com \ + ADMIN_USERNAME=root \ + ADMIN_PASSWORD=root + +EXPOSE 3000 + +CMD [ "yarn", "start:prod" ] diff --git a/api b/api index 55ab5062..91e5c333 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 55ab5062de4855a2652c93e355eb049b2345e90b +Subproject commit 91e5c333400733ae0e7a8d98b7b5cd15ccf74378 diff --git a/ui b/ui index 472e07bd..97794bcb 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 472e07bd29d4a6c2699035c35d0fc53ea32089ee +Subproject commit 97794bcbf9209e98b7721d980d374e88e6c60bcf