From b4b1fe878f9417b04e3d1bd3279ca3ef85bc4605 Mon Sep 17 00:00:00 2001 From: Aetherinox Date: Sun, 23 Feb 2025 08:49:05 -0700 Subject: [PATCH] feat: add env variable `DIR_BUILD` --- Dockerfile | 8 ++++---- Dockerfile.aarch64 | 7 ++++--- root/etc/services.d/tvapp2/run | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 51781564..9732c5dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,8 +56,8 @@ ENV WEB_IP="0.0.0.0" ENV WEB_PORT=4124 ENV NODE_VERSION=18.20.5 ENV YARN_VERSION=1.22.22 -ENV INSTALL_DIR=/usr/src/app -ENV WORKING_DIR=/usr/bin/app +ENV DIR_BUILD=/usr/src/app +ENV DIR_RUN=/usr/bin/app # # # Install @@ -87,7 +87,7 @@ COPY root/ / # set work directory # # -WORKDIR ${INSTALL_DIR} +WORKDIR ${DIR_BUILD} # # # copy tvapp2 project to workdir @@ -99,7 +99,7 @@ COPY tvapp2/ ./ # set work dir to built app # # -WORKDIR ${WORKING_DIR} +WORKDIR ${DIR_RUN} # # # Ports and volumes diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f9f6f713..ceb1c68a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -56,7 +56,8 @@ ENV WEB_IP="0.0.0.0" ENV WEB_PORT=4124 ENV NODE_VERSION=18.20.5 ENV YARN_VERSION=1.22.22 -ENV WORKING_DIR=/usr/bin/app +ENV DIR_BUILD=/usr/src/app +ENV DIR_RUN=/usr/bin/app # # # Install @@ -86,7 +87,7 @@ COPY root/ / # set work directory # # -WORKDIR /usr/src/app +WORKDIR ${DIR_BUILD} # # # copy tvapp2 project to workdir @@ -98,7 +99,7 @@ COPY tvapp2/ ./ # set work dir to built app # # -WORKDIR ${WORKING_DIR} +WORKDIR ${DIR_RUN} # # # Ports and volumes diff --git a/root/etc/services.d/tvapp2/run b/root/etc/services.d/tvapp2/run index baf4b1c0..f253f076 100755 --- a/root/etc/services.d/tvapp2/run +++ b/root/etc/services.d/tvapp2/run @@ -4,7 +4,7 @@ # install and startup for tvapp2 # # -cp -r ${INSTALL_DIR} ${WORKING_DIR} -rm -rf ${INSTALL_DIR}/* -cd ${WORKING_DIR} +cp -r ${DIR_BUILD} ${DIR_RUN} +rm -rf ${DIR_BUILD}/* +cd ${DIR_RUN} npm start