Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bug Fix] unable to login Docker #3040

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we know why atomic was being disabled previously?

# Set up config file and dont disable atomic by default
Copy link

@rfulwell rfulwell Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: it should be "don't"
alternatively skip the negative part of the comment altogether:

Suggested change
# Set up config file and dont disable atomic by default
# Set up config file

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.

Expand Down Expand Up @@ -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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it looks like this change will not build the magma plugin - is that right?


WORKDIR /usr/src/app

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick:

Suggested change
logging.info(f"Successfuly set {url} as base url.")
logging.info(f"Successfully set {url} as base url.")

with open(f"{MAGMA_PATH}/.env", "w") as fp:
fp.write(f"VITE_CALDERA_URL={url}")

Expand Down Expand Up @@ -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)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this intentionally removing the blank line and nothing else?

app_svc.application.on_response_prepare.append(enable_cors)
if args.build:
if len(os.listdir(MAGMA_PATH)) > 0:
configure_magma_env_file()
Expand Down
Loading