Skip to content

Commit 9fe7f82

Browse files
jongyoulsh1nj1
authored andcommitted
[MINOR] Fix Dockerfile
1 parent 1a419f6 commit 9fe7f82

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

docs/development/contribution/how_to_contribute_code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ Get the source code on your development machine using git.
5454
git clone git://gitbox.apache.org/repos/asf/zeppelin.git zeppelin
5555
```
5656

57-
You may also want to develop against a specific branch. For example, for branch-0.11.0
57+
You may also want to develop against a specific branch. For example, for branch-0.12
5858

5959
```bash
60-
git clone -b branch-0.11.0 git://gitbox.apache.org/repos/asf/zeppelin.git zeppelin
60+
git clone -b branch-0.12 git://gitbox.apache.org/repos/asf/zeppelin.git zeppelin
6161
```
6262

6363
Apache Zeppelin follows [Fork & Pull](https://github.com/sevntu-checkstyle/sevntu.checkstyle/wiki/Development-workflow-with-Git:-Fork,-Branching,-Commits,-and-Pull-Request) as a source control workflow.

scripts/docker/zeppelin/bin/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,11 @@ RUN set -ex && \
5151
export PATH=/opt/conda/bin:$PATH && \
5252
conda config --set always_yes yes --set changeps1 no && \
5353
conda info -a && \
54+
conda config --remove channels defaults && \
55+
conda config --add channels conda-forge && \
56+
conda config --set channel_priority strict && \
5457
conda install mamba -c conda-forge && \
55-
mamba env update -f /env_python_3_with_R.yml --prune && \
58+
mamba env create -f /env_python_3_with_R.yml -c conda-forge && \
5659
# Cleanup
5760
rm -v miniconda.sh anaconda.sha256 && \
5861
# Cleanup based on https://github.com/ContinuumIO/docker-images/commit/cac3352bf21a26fa0b97925b578fb24a0fe8c383

scripts/docker/zeppelin/bin/env_python_3_with_R.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
name: python_3_with_R
22
channels:
33
- conda-forge
4-
- defaults
54
dependencies:
6-
- python=3.7
5+
- python=3.9
76
- pycodestyle
87
- scipy
98
- numpy=1.19.5

0 commit comments

Comments
 (0)