diff --git a/Dockerfile b/Dockerfile index a6bf1cd6f..a402ebfe5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,9 +27,9 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH" # Install pip requirements RUN pip3 install --no-cache-dir -r requirements.txt -# Set up config file and disable atomic by default -RUN python3 -c "import app; import app.utility.config_generator; app.utility.config_generator.ensure_local_config();"; \ - sed -i '/\- atomic/d' conf/local.yml; +# Set up config file and dont disable atomic by default +RUN python3 -c "import app; import app.utility.config_generator; app.utility.config_generator.ensure_local_config();" + # Compile default sandcat agent binaries, which will download basic golang dependencies. @@ -79,15 +79,7 @@ WORKDIR /usr/src/app # Install Node.js, npm, and other build VueJS front-end RUN apt-get update && \ - apt-get install -y nodejs npm && \ - # Directly use npm to install dependencies and build the application - (cd plugins/magma && npm install) && \ - (cd plugins/magma && npm run build) && \ - # Remove Node.js, npm, and other unnecessary packages - apt-get remove -y nodejs npm && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + apt-get install -y nodejs npm WORKDIR /usr/src/app diff --git a/README.md b/README.md index a5e813263..e946c20b3 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ cd caldera docker build . --build-arg WIN_BUILD=true -t caldera:latest # Run the image. Change port forwarding configuration as desired. -docker run -p 8888:8888 caldera:latest +docker run -p 8888:8888 caldera:latest --build ``` To gracefully terminate your docker container, do the following: diff --git a/server.py b/server.py index 7fc4d5b40..b30e63227 100644 --- a/server.py +++ b/server.py @@ -150,6 +150,7 @@ async def start_vue_dev_server(): def configure_magma_env_file(): logging.info("Setting VueJS environment file.") url = BaseWorld.get_config("app.frontend.api_base_url") + logging.info(f"Successfuly set {url} as base url.") with open(f"{MAGMA_PATH}/.env", "w") as fp: fp.write(f"VITE_CALDERA_URL={url}") @@ -265,8 +266,7 @@ def list_str(values): logging.info("Building VueJS front-end.") subprocess.run(["npm", "run", "build"], cwd=MAGMA_PATH, check=True) logging.info("VueJS front-end build complete.") - app_svc.application.on_response_prepare.append(enable_cors) - + app_svc.application.on_response_prepare.append(enable_cors) if args.build: if len(os.listdir(MAGMA_PATH)) > 0: configure_magma_env_file()