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

#6358 Fix docker language warnings. #6448

Merged
merged 3 commits into from
Dec 5, 2017
Merged

#6358 Fix docker language warnings. #6448

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
a8f2554
#6358 Fix docker language warnings.
michalgce Dec 1, 2017
39cab56
#6358 Redo nodejs via conda.
michalgce Dec 4, 2017
9f2115d
#6358 Added option encoding UTF-8 to gradle.
michalgce Dec 5, 2017
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: 4 additions & 6 deletions docker/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ RUN useradd beakerx --create-home
ENV CONDA_DIR /opt/conda
ENV PATH /opt/conda/bin:$PATH
ENV NB_USER beakerx
ENV LC_ALL en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US.UTF-8
ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update && apt-get dist-upgrade -y && \
apt-get install -y sudo curl unzip software-properties-common apt-transport-https git bzip2 wget locales && \
locale-gen en_US.UTF-8 && \
RUN apt-get update && \
apt-get install -y --no-install-recommends apt-utils sudo curl unzip software-properties-common apt-transport-https git bzip2 wget && \
apt-get dist-upgrade -y && \
echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \
wget --quiet https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \
/bin/bash ~/miniconda.sh -b -p /opt/conda && \
Expand Down
1 change: 1 addition & 0 deletions kernel/base/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ repositories {
compileJava {
options.compilerArgs << '-Xlint:sunapi'
options.compilerArgs << '-XDenableSunApiLintControl'
options.encoding = "UTF-8"
}

dependencies {
Expand Down
4 changes: 4 additions & 0 deletions kernel/java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ configurations {
antlr
}

compileJava {
options.encoding = "UTF-8"
}

sourceSets {
main {
compileClasspath += configurations.provided
Expand Down