Skip to content

[25.1] Fix Docker build issues for k8s_ci container #21593

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

Open
dannon wants to merge 3 commits into
base: release_25.1
Choose a base branch
from
Open

[25.1] Fix Docker build issues for k8s_ci container #21593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
917e389
Set PYTHONPATH for Galaxy library access in container
dannon Mar 22, 2024
b7ea3e4
Exclude node_modules at all depths in Docker builds
dannon Jan 15, 2026
18c0b8c
Strip inline comments from conditional-requirements.txt in Docker build
dannon Jan 15, 2026
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
2 changes: 1 addition & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.k8s_ci.Dockerfile
.venv
database
node_modules
**/node_modules
4 changes: 4 additions & 0 deletions .k8s_ci.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ RUN ansible-galaxy install -r requirements.yml -p roles --force-with-deps
# Add Galaxy source code
COPY . $SERVER_DIR/

# Strip inline comments from conditional-requirements.txt (ansible role passes lines directly to pip)
RUN sed -i 's/[[:space:]]*# type:.*$//' $SERVER_DIR/lib/galaxy/dependencies/conditional-requirements.txt
Copy link
Member

@mvdbeek mvdbeek Jan 20, 2026

Choose a reason for hiding this comment

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

I'd imagine this would also be an issue for ansible-galaxy ?

Copy link
Member

@nsoranzo nsoranzo Jan 20, 2026

Choose a reason for hiding this comment

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

@mvdbeek galaxyproject/ansible-galaxy#240


#======================================================
# Stage 2.1 - Build galaxy server
#======================================================
Expand Down Expand Up @@ -191,6 +194,7 @@ USER $GALAXY_USER

ENV PATH="$SERVER_DIR/.venv/bin:${PATH}"
ENV GALAXY_CONFIG_CONDA_AUTO_INIT=False
ENV PYTHONPATH="$SERVER_DIR/lib/"
Copy link
Member

@mvdbeek mvdbeek Jan 20, 2026

Choose a reason for hiding this comment

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

Does that not mess with the tool execution environment ? it may be fine but may also be a gotcha later on

Copy link
Member Author

@dannon dannon Jan 20, 2026

Choose a reason for hiding this comment

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

Would love a sanity check from other deployments of the container -- this fixed problems I had but I can maintain it as a patch if need be.


ENTRYPOINT ["tini", "--"]

Expand Down
Loading