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.

Sign up for GitHub

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

Jump to bottom

Replaces J2 with env-generator #274

Closed
wants to merge 2 commits into from
Closed

Replaces J2 with env-generator #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
415fedf
#255 replace j2 with env-generator
esilvaju Nov 23, 2023
de1f3dd
Merge branch 'rucio:master' into esilvaju/issue255
esilvaju Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions webui/Dockerfile
View file
Open in desktop
Expand Up @@ -29,14 +29,19 @@ WORKDIR /opt/rucio/webui

ENV RUCIO_WEBUI_PATH=$(WORKDIR)

RUN curl https://raw.githubusercontent.com/rucio/rucio/master/tools/merge_rucio_configs.py --output /opt/rucio/merge_rucio_configs.py
RUN git clone --depth 1 -b ${TAG} -- https://github.com/rucio/webui.git /opt/rucio/webui

WORKDIR /opt/rucio/webui/tools/env-generator/
RUN npm install
RUN npm install liquidjs
RUN npm run build
RUN chmod +x ./dist/generate-env.js

WORKDIR /opt/rucio/webui/
RUN npm install
RUN npm run build

COPY docker-entrypoint.sh /
COPY .env.default.j2 /tmp/

EXPOSE 443
EXPOSE 80
Expand Down
2 changes: 1 addition & 1 deletion webui/docker-entrypoint.sh
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ if [ -f /opt/rucio/webui/.env ]; then
echo "/opt/rucio/webui/.env already mounted."
else
echo "/opt/rucio/webui/.env not found. will generate one."
j2 /tmp/.env.default.j2 | sed '/^\s*$/d' > /opt/rucio/webui/.env
/opt/rucio/webui/tools/env-generator/dist/generate-env.js make prod /opt/rucio/webui/./.env --write
fi

echo "=================== /opt/rucio/webui/.env ========================"
Expand Down