-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
base: master
Are you sure you want to change the base?
Changes from all commits
1e38559
914755f
d0f8daf
1a2c950
41782d9
6c20709
96e7b22
aa8945f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -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 | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nitpick: it should be "don't"
Suggested change
|
||||||
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 | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it looks like this change will not build the |
||||||
|
||||||
WORKDIR /usr/src/app | ||||||
|
||||||
|
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -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.") | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nitpick:
Suggested change
|
||||||
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) | ||||||
|
||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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() | ||||||
|
There was a problem hiding this comment.
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?