fix(docker): update Dockerfile and docker-compose files for app; chor…

…e(docker): add docker-build and docker-config rules;

.docker/Dockerfile.app

@@ -64,9 +64,9 @@ ENV APP_CLONE_DIR $ARG_APP_CLONE_DIR
 # Sets the working directory to workspace root
 WORKDIR $WORKSPACE_ROOT
 # Copies scripts from host into the image
-COPY ./.docker/scripts/ ./scripts/
+COPY ./.docker/.docker-scripts/ ./.docker-scripts/
 # Installs Python dependencies listed in requirements.txt
-RUN pip install -r ./scripts/requirements.txt
+RUN pip install -r ./.docker-scripts/requirements.txt
 
 # Clones the stable-diffusion-webui repository from GitHub
 RUN git clone "https://github.com/$APP_GITHUB_USERNAME/$APP_GITHUB_REPO.git" $APP_PROJECT_ROOT/$APP_CLONE_DIR

.docker/docker-compose-app.yaml

@@ -7,7 +7,7 @@ services:
       # Sets the build context to the current directory
       context: .
       # Specifies the Dockerfile to use for the build
-      dockerfile: .docker/Dockerfile
+      dockerfile: .docker/Dockerfile.app
       # Specifies build-time variables (ARGs)
       args:
         ARG_BUILD_FROM: $BUILD_FROM

Makefile

@@ -107,3 +107,12 @@ init-project: initialize ## initialize the project (Warning: do this only once!)
 
 reinit-project: install-copier ## reinitialize the project (Warning: this may overwrite existing files!)
 	@bash -c 'args=(); while IFS= read -r file; do args+=("--skip" "$$file"); done < .copierignore; copier "$${args[@]}" --answers-file .copier-config.yaml --vcs-ref=HEAD gh:entelecheia/hyperfast-docker-template .'
+
+##@ Docker
+
+docker-build: ## build the docker image
+	@bash -c 'set -a; source .docker/docker.app.env; set +a; docker-compose --project-directory . -f .docker/docker-compose-app.yaml build'
+
+docker-config: ## show the docker config
+	@bash -c 'set -a; source .docker/docker.app.env; set +a; docker-compose --project-directory . -f .docker/docker-compose-app.yaml config'
+