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

Enable color terminal in common cases #826

Merged
merged 2 commits into from
Mar 14, 2019
Merged

Enable color terminal in common cases #826

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f081d9e
Enable color prompts
parente Mar 13, 2019
0023598
Force color only exists in the /etc/skel/.bashrc
parente Mar 13, 2019
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
10 changes: 9 additions & 1 deletion base-notebook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,16 @@ ENV CONDA_DIR=/opt/conda \
ENV PATH=$CONDA_DIR/bin:$PATH \
HOME=/home/$NB_USER

# Add a script that we will use to correct permissions after running certain commands
ADD fix-permissions /usr/local/bin/fix-permissions
# Create jovyan user with UID=1000 and in the 'users' group

# Enable prompt color in the skeleton .bashrc before creating the default NB_USER
# and in the default bash.bashrc for the case where the user home directory gets
# overridden.
RUN sed -i 's/^#force_color_prompt=yes/force_color_prompt=yes/' /etc/skel/.bashrc && \
sed -i 's/^#force_color_prompt=yes/force_color_prompt=yes/' /etc/bash.bashrc
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this second sed have any effect?

 docker run -it --rm ubuntu:bionic-20180526@sha256:c8c275751219dadad8fa56b3ac41ca6cb22219ff117ca98fe82b42f24e1ba64e grep -r force_color_prompt /etc
/etc/skel/.bashrc:#force_color_prompt=yes
/etc/skel/.bashrc:if [ -n "$force_color_prompt" ]; then
/etc/skel/.bashrc:unset color_prompt force_color_prompt

Copy link
Member Author

Choose a reason for hiding this comment

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

You are correct. I mistakenly thought the bash.bashrc also respected this flag. I've removed the second line and will update the PR description so that it correctly reflects what the PR enables.


# Create NB_USER wtih name jovyan user with UID=1000 and in the 'users' group
# and make sure these dirs are writable by the `users` group.
RUN groupadd wheel -g 11 && \
echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su && \
Expand Down