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

Feature: spark move jars on docker image #510

Merged
merged 71 commits into from
May 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
0d1b024
add spark2.3.0 hadoop2.8.3 dockerfile
jafreck Apr 10, 2018
695d4d9
start update to docker image
jafreck Apr 10, 2018
88e4043
add SPARK_DIST_CLASSPATH to bashrc, source .bashrc in docker run
jafreck Apr 11, 2018
9738d55
add maven install for jars
jafreck Apr 11, 2018
59be748
docker image update and code fix
jafreck Apr 12, 2018
626e703
add libthrift (still broken)
jafreck Apr 13, 2018
38a6160
start image refactor, build from source,
jafreck Apr 17, 2018
1d72184
add refactor to r base image
jafreck Apr 17, 2018
f70b8b0
finish refactor r image
jafreck Apr 17, 2018
e3bdb2e
Merge branch 'feature/spark-move-jars-on-docker-image' of github.com:…
jafreck Apr 17, 2018
fa9ca02
Merge remote-tracking branch 'upstream/master' into feature/spark-mov…
jafreck Apr 17, 2018
8e34b62
add storage jars and deps
jafreck Apr 18, 2018
c9aaae1
exclude netty to get rid of dependency conflict
jafreck Apr 18, 2018
14c5702
add miniconda image
jafreck Apr 19, 2018
694e60a
update 2.2.0 base, anaconda image
jafreck Apr 19, 2018
634d07a
remove unused cuda-8.0 image
jafreck Apr 19, 2018
8a29c50
start pipenv implementation
jafreck Apr 19, 2018
c4e4045
miniconda version arg
jafreck Apr 19, 2018
91b886e
update anaconda and miniconda image
jafreck Apr 19, 2018
f94ca77
style
jafreck Apr 19, 2018
abb7063
pivot to virtualenv
jafreck Apr 20, 2018
5f9095a
remove virtualenv from path when submitting apps
jafreck Apr 20, 2018
cd4615c
flatten layers
jafreck Apr 20, 2018
38f75fe
explicit calls to aztk python instead of activating virtualenv
jafreck Apr 20, 2018
f5c010b
update base, miniconda, anaconda
jafreck Apr 21, 2018
91d30d1
add compatibility version for base aztk images
jafreck Apr 23, 2018
9327bde
typo fix
jafreck Apr 23, 2018
f60ff7a
Merge remote-tracking branch 'upstream/master' into feature/spark-mov…
jafreck Apr 23, 2018
11e7d30
update pom
jafreck Apr 23, 2018
5e33c03
merge
jafreck Apr 24, 2018
d000817
update environment variable name
jafreck Apr 24, 2018
d8ac039
update environment variables
jafreck Apr 24, 2018
e4a7d8e
add anaconda images base & gpu
jafreck Apr 24, 2018
313718b
update gpu and miniconda base images
jafreck Apr 24, 2018
c0a445d
create venv in cluster create
jafreck Apr 24, 2018
f410e79
update base docker files, remove virtualenv
jafreck Apr 24, 2018
c841157
Merge remote-tracking branch 'upstream/master' into feature/spark-mov…
jafreck Apr 24, 2018
f749a69
fix path
jafreck Apr 24, 2018
6e106d7
add exclusion to base images
jafreck Apr 24, 2018
7e27b30
update r images
jafreck Apr 24, 2018
e380225
delete python images (in favor of anaconda and miniconda)
jafreck Apr 24, 2018
77bf6b8
add miniconda gpu images
jafreck Apr 25, 2018
7bfc8b5
update comment
jafreck Apr 25, 2018
68e131b
update aztk_version_compatibility to dokcer image version
jafreck Apr 25, 2018
752ef07
add a build script
jafreck Apr 26, 2018
d8b439f
virutalenv->pipenv, add pipfile & pipfile.lock remove secretstorage
jafreck Apr 26, 2018
bc2e892
aztk/staging->aztk/spark
jafreck Apr 26, 2018
f4b89a0
Merge branch 'master' into feature/spark-move-jars-on-docker-image
jafreck Apr 26, 2018
4ea3cde
Merge branch 'master' into feature/spark-move-jars-on-docker-image
jafreck Apr 26, 2018
dd58e21
Merge branch 'master' into feature/spark-move-jars-on-docker-image
jafreck Apr 26, 2018
5b4008f
remove jars, add .null to keep directory
jafreck Apr 26, 2018
5a8c370
update pipfile, update jupyter and jupyterlab
jafreck Apr 26, 2018
3ec13bc
update default images
jafreck Apr 26, 2018
e427a0f
merge
jafreck Apr 26, 2018
eaad3d4
update base images to fix hdfs
jafreck Apr 27, 2018
15c0d05
update build script with correct path
jafreck Apr 27, 2018
5013d74
add spark1.6.3 anaconda, miniconda, r base and gpu images
jafreck Apr 27, 2018
1a8739a
update build script to include spark1.6.3
jafreck Apr 27, 2018
28523af
mkdir out
jafreck Apr 27, 2018
d382474
exclude commons lang and slf4j dependencies
jafreck Apr 27, 2018
d82be1d
mkdir out
jafreck Apr 27, 2018
c0adfcb
no fail if dir exists
jafreck Apr 28, 2018
d503502
update node_scripts
jafreck Apr 29, 2018
b944a89
Merge branch 'master' into feature/spark-move-jars-on-docker-image
timotheeguerin Apr 30, 2018
fde73a6
Merge remote-tracking branch 'upstream/master' into feature/spark-mov…
jafreck Apr 30, 2018
6423af3
Merge branch 'feature/spark-move-jars-on-docker-image' of github.com:…
jafreck Apr 30, 2018
70416bc
update env var name
jafreck Apr 30, 2018
6c10075
update env var name
jafreck Apr 30, 2018
96efe95
fix the docker_repo docs
jafreck Apr 30, 2018
6227f31
master->0.7.0
jafreck Apr 30, 2018
6e03b4a
Merge remote-tracking branch 'upstream/master' into feature/spark-mov…
jafreck Apr 30, 2018
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This toolkit is built on top of Azure Batch but does not require any Azure Batch
```
3. Login or register for an [Azure Account](https://azure.microsoft.com), navigate to [Azure Cloud Shell](https://shell.azure.com), and run:
```sh
wget -q https://raw.githubusercontent.com/Azure/aztk/master/account_setup.sh -O account_setup.sh &&
wget -q https://raw.githubusercontent.com/Azure/aztk/v0.7.0/account_setup.sh -O account_setup.sh &&
chmod 755 account_setup.sh &&
/bin/bash account_setup.sh
```
Expand Down
2 changes: 1 addition & 1 deletion account_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ echo "Installing depdendencies..." &&
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 &&
echo "Finished installing depdencies." &&
echo "Getting account setup script..." &&
wget -q https://raw.githubusercontent.com/Azure/aztk/master/account_setup.py -O account_setup.py &&
wget -q https://raw.githubusercontent.com/Azure/aztk/v0.7.0/account_setup.py -O account_setup.py &&
chmod 755 account_setup.py &&
echo "Finished getting account setup script." &&
echo "Running account setup script..." &&
Expand Down
17 changes: 17 additions & 0 deletions aztk/node_scripts/Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[[source]]
url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"

[packages]
azure-batch = "==4.1.3"
azure-mgmt-batch = "==5.0.0"
azure-mgmt-storage = "==1.5.0"
azure-storage-blob = "==1.1.0"
pycryptodome = "==3.4.7"
PyYAML = "==3.12"

[dev-packages]

[requires]
python_version = "3.5"
291 changes: 291 additions & 0 deletions aztk/node_scripts/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions aztk/node_scripts/docker_main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# This file is the entry point of the docker container.

set -e
source ~/.bashrc
echo "Initializing spark container"

# --------------------
Expand All @@ -25,15 +26,14 @@ done
# ----------------------------
# Run aztk setup python scripts
# ----------------------------
# use python v3.5.4 to run aztk software
# setup docker container
echo "Starting setup using Docker"

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

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

# sleep to keep container running
while true; do sleep 1; done
1 change: 1 addition & 0 deletions aztk/node_scripts/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ azure-mgmt-storage==1.5.0
azure-storage-blob==1.1.0
pyyaml==3.12
pycryptodome==3.4.7

Loading