Skip to content
This repository was archived by the owner on Feb 3, 2021. It is now read-only.

Commit 779bffb

Browse files
authored
Feature: refactor docker images (#510)
* add spark2.3.0 hadoop2.8.3 dockerfile * start update to docker image * add SPARK_DIST_CLASSPATH to bashrc, source .bashrc in docker run * add maven install for jars * docker image update and code fix * add libthrift (still broken) * start image refactor, build from source, * add refactor to r base image * finish refactor r image * add storage jars and deps * exclude netty to get rid of dependency conflict * add miniconda image * update 2.2.0 base, anaconda image * remove unused cuda-8.0 image * start pipenv implementation * miniconda version arg * update anaconda and miniconda image * style * pivot to virtualenv * remove virtualenv from path when submitting apps * flatten layers * explicit calls to aztk python instead of activating virtualenv * update base, miniconda, anaconda * add compatibility version for base aztk images * typo fix * update pom * update environment variable name * update environment variables * add anaconda images base & gpu * update gpu and miniconda base images * create venv in cluster create * update base docker files, remove virtualenv * fix path * add exclusion to base images * update r images * delete python images (in favor of anaconda and miniconda) * add miniconda gpu images * update comment * update aztk_version_compatibility to dokcer image version * add a build script * virutalenv->pipenv, add pipfile & pipfile.lock remove secretstorage * aztk/staging->aztk/spark * remove jars, add .null to keep directory * update pipfile, update jupyter and jupyterlab * update default images * update base images to fix hdfs * update build script with correct path * add spark1.6.3 anaconda, miniconda, r base and gpu images * update build script to include spark1.6.3 * mkdir out * exclude commons lang and slf4j dependencies * mkdir out * no fail if dir exists * update node_scripts * update env var name * update env var name * fix the docker_repo docs * master->0.7.0
1 parent 47000a5 commit 779bffb

File tree

68 files changed

+1806
-1081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1806
-1081
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This toolkit is built on top of Azure Batch but does not require any Azure Batch
2727
```
2828
3. Login or register for an [Azure Account](https://azure.microsoft.com), navigate to [Azure Cloud Shell](https://shell.azure.com), and run:
2929
```sh
30-
wget -q https://raw.githubusercontent.com/Azure/aztk/master/account_setup.sh -O account_setup.sh &&
30+
wget -q https://raw.githubusercontent.com/Azure/aztk/v0.7.0/account_setup.sh -O account_setup.sh &&
3131
chmod 755 account_setup.sh &&
3232
/bin/bash account_setup.sh
3333
```

account_setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ echo "Installing depdendencies..." &&
44
pip install --force-reinstall --upgrade --user pyyaml==3.12 azure==3.0.0 azure-cli-core==2.0.30 msrestazure==0.4.25 > /dev/null 2>&1 &&
55
echo "Finished installing depdencies." &&
66
echo "Getting account setup script..." &&
7-
wget -q https://raw.githubusercontent.com/Azure/aztk/master/account_setup.py -O account_setup.py &&
7+
wget -q https://raw.githubusercontent.com/Azure/aztk/v0.7.0/account_setup.py -O account_setup.py &&
88
chmod 755 account_setup.py &&
99
echo "Finished getting account setup script." &&
1010
echo "Running account setup script..." &&

aztk/node_scripts/Pipfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[[source]]
2+
url = "https://pypi.python.org/simple"
3+
verify_ssl = true
4+
name = "pypi"
5+
6+
[packages]
7+
azure-batch = "==4.1.3"
8+
azure-mgmt-batch = "==5.0.0"
9+
azure-mgmt-storage = "==1.5.0"
10+
azure-storage-blob = "==1.1.0"
11+
pycryptodome = "==3.4.7"
12+
PyYAML = "==3.12"
13+
14+
[dev-packages]
15+
16+
[requires]
17+
python_version = "3.5"

aztk/node_scripts/Pipfile.lock

Lines changed: 291 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

aztk/node_scripts/docker_main.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# This file is the entry point of the docker container.
44

55
set -e
6+
source ~/.bashrc
67
echo "Initializing spark container"
78

89
# --------------------
@@ -25,15 +26,14 @@ done
2526
# ----------------------------
2627
# Run aztk setup python scripts
2728
# ----------------------------
28-
# use python v3.5.4 to run aztk software
29+
# setup docker container
2930
echo "Starting setup using Docker"
3031

31-
$(pyenv root)/versions/$AZTK_PYTHON_VERSION/bin/pip install -r $(dirname $0)/requirements.txt
3232
export PYTHONPATH=$PYTHONPATH:$AZTK_WORKING_DIR
3333
echo 'export PYTHONPATH=$PYTHONPATH:$AZTK_WORKING_DIR' >> ~/.bashrc
3434

3535
echo "Running main.py script"
36-
$(pyenv root)/versions/$AZTK_PYTHON_VERSION/bin/python $(dirname $0)/main.py setup-spark-container
36+
$AZTK_WORKING_DIR/.aztk-env/.venv/bin/python $(dirname $0)/main.py setup-spark-container
3737

3838
# sleep to keep container running
3939
while true; do sleep 1; done

aztk/node_scripts/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ azure-mgmt-storage==1.5.0
44
azure-storage-blob==1.1.0
55
pyyaml==3.12
66
pycryptodome==3.4.7
7+

0 commit comments

Comments
 (0)