From 0cfa8e8b943fb636c0f8c7d41377a1a0490c50b6 Mon Sep 17 00:00:00 2001 From: Lee Render Date: Fri, 4 Nov 2022 12:50:23 +0800 Subject: [PATCH] rdrf #2260 back to running node as root.. --- Dockerfile-node | 9 ++------- docker-compose-build.yml | 4 ++-- docker-compose.yml | 4 ++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Dockerfile-node b/Dockerfile-node index e45b282fe..69641e7ae 100644 --- a/Dockerfile-node +++ b/Dockerfile-node @@ -9,13 +9,8 @@ COPY docker-entrypoint-node.sh /app/docker-entrypoint-node.sh VOLUME ["/data"] -ENV YARN_CACHE_FOLDER /frontendbuild/yarn_cache -RUN mkdir -p /frontendbuild/yarn_cache -RUN mkdir -p /frontendbuild/build -RUN chown -R node:node /frontendbuild -ENV HOME /frontendbuild -USER node -WORKDIR /app/rdrf/rdrf/frontend +ENV HOME /data +WORKDIR /data ENTRYPOINT ["/app/docker-entrypoint-node.sh"] CMD ["build"] diff --git a/docker-compose-build.yml b/docker-compose-build.yml index f2ea87b3b..466ddc9ab 100644 --- a/docker-compose-build.yml +++ b/docker-compose-build.yml @@ -35,10 +35,10 @@ services: working_dir: /data/app/rdrf/rdrf/frontend command: build environment: - YARN_CACHE_FOLDER: /frontendbuild/yarn_cache + YARN_CACHE_FOLDER: /opt/yarn_cache volumes: - ./build:/data - - ./yarn_cache:/frontendbuild/yarn_cache + - ./yarn_cache:/opt/yarn_cache dev: diff --git a/docker-compose.yml b/docker-compose.yml index 51c4f5cfc..a612abece 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,9 +44,9 @@ services: command: "watch" working_dir: /app/rdrf/rdrf/frontend environment: - YARN_CACHE_FOLDER: /frontendbuild/yarn_cache + YARN_CACHE_FOLDER: /opt/yarn_cache volumes: - - ./yarn_cache:/data/yarn_cache + - ./yarn_cache:/opt/yarn_cache volumes_from: - datadev