From 24b1b2b4adda3fc1fe75f065df360cd405168cc9 Mon Sep 17 00:00:00 2001 From: orosmatthew Date: Tue, 12 Mar 2024 12:25:28 -0400 Subject: [PATCH] [Web][Sandbox] Fix docker builds --- sandbox/Dockerfile | 10 +++------- shared/.dockerignore | 1 + web/Dockerfile | 10 +++------- 3 files changed, 7 insertions(+), 14 deletions(-) create mode 100644 shared/.dockerignore diff --git a/sandbox/Dockerfile b/sandbox/Dockerfile index 08230b7..6f0f273 100644 --- a/sandbox/Dockerfile +++ b/sandbox/Dockerfile @@ -31,16 +31,12 @@ COPY ./sandbox/package*.json ./ RUN npm install COPY ./sandbox/ . -# Prep SubmissionRunner +# Prep Shared WORKDIR /app RUN mkdir shared -RUN mkdir shared/submissionRunner -WORKDIR /app/shared/submissionRunner - -COPY ./shared/submissionRunner/package*.json . -RUN npm install -COPY ./shared/submissionRunner/ . +WORKDIR /app/shared +COPY ./shared . # Build/Run diff --git a/shared/.dockerignore b/shared/.dockerignore new file mode 100644 index 0000000..30bc162 --- /dev/null +++ b/shared/.dockerignore @@ -0,0 +1 @@ +/node_modules \ No newline at end of file diff --git a/web/Dockerfile b/web/Dockerfile index 2482f81..a5a4816 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -20,16 +20,12 @@ COPY ./web/package*.json ./ RUN npm install COPY ./web/ . -# Prep extensionWeb +# Prep Shared WORKDIR /app RUN mkdir shared -RUN mkdir shared/extensionWeb -WORKDIR /app/shared/extensionWeb - -COPY ./shared/extensionWeb/package*.json . -RUN npm install -COPY ./shared/extensionWeb/ . +WORKDIR /app/shared +COPY ./shared/ . # Env/Build/Run