Change install dir to user home

permissions set in java policy template are tailored to these paths under the user home
metafacture · Jun 10, 2024 · adbc52f · adbc52f
1 parent a925d77
commit adbc52f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -26,22 +26,24 @@ RUN groupadd --gid $USER_GID $USERNAME \
 
 USER $USERNAME
 
+ARG INSTALL_DIR=/home/$USERNAME
+
 ## metafacture-core
-WORKDIR /opt/metafacture-core
+WORKDIR $INSTALL_DIR/metafacture-core
 RUN git clone https://github.com/metafacture/metafacture-core.git .
 # use master for now, not a specific version
 # must match dependencies in project.clj
 #RUN git checkout metafacture-core-6.0.0
 RUN ./gradlew install
 
 ## metafacture-fix
-WORKDIR /opt/metafacture-fix
+WORKDIR $INSTALL_DIR/metafacture-fix
 RUN git clone https://github.com/metafacture/metafacture-fix.git .
 RUN git checkout 1.0.0
 RUN ./gradlew install
 
 ## metafacture-playground
-WORKDIR /opt/metafacture-playground
+WORKDIR $INSTALL_DIR/metafacture-playground
 COPY --chown="$USERNAME:$USERNAME" ./ .
 
 COPY --chown="$USERNAME:$USERNAME" resources/.java.policy_move_to_home_dir /home/$USERNAME/.java.policy 

diff --git a/Dockerfile.prod b/Dockerfile.prod
@@ -26,22 +26,24 @@ RUN groupadd --gid $USER_GID $USERNAME \
 
 USER $USERNAME
 
+ARG INSTALL_DIR=/home/$USERNAME
+
 ## metafacture-core
-WORKDIR /opt/metafacture-core
+WORKDIR $INSTALL_DIR/metafacture-core
 RUN git clone https://github.com/metafacture/metafacture-core.git .
 # use master for now, not a specific version
 # must match dependencies in project.clj
 #RUN git checkout metafacture-core-6.0.0
 RUN ./gradlew install
 
 ## metafacture-fix
-WORKDIR /opt/metafacture-fix
+WORKDIR $INSTALL_DIR/metafacture-fix
 RUN git clone https://github.com/metafacture/metafacture-fix.git .
 RUN git checkout 1.0.0
 RUN ./gradlew install
 
 ## metafacture-playground
-WORKDIR /opt/metafacture-playground
+WORKDIR $INSTALL_DIR/metafacture-playground
 RUN git clone https://github.com/metafacture/metafacture-playground.git .
 
 COPY --chown="$USERNAME:$USERNAME" resources/.java.policy_move_to_home_dir /home/$USERNAME/.java.policy 

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -8,7 +8,7 @@ services:
       context: .
       dockerfile: Dockerfile.dev
     volumes:
-      - .:/opt/metafacture-playground
+      - .:/home/playground/metafacture-playground
     ports:
       - 8280:8280
       - 9630:9630