Skip to content

Commit

Permalink
Merge pull request #131 from xhochy/upload-miniforge3
Browse files Browse the repository at this point in the history
Build and upload miniforge3 image
  • Loading branch information
scopatz authored Apr 15, 2020
2 parents f73bdd7 + f601a42 commit 8ae623a
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- run:
name: Build miniforge3 image
command: |
docker build -t condaforge/miniforge3 miniforge3/ubuntu
docker build -t condaforge/miniforge3 miniforge3
- run:
name: Run miniforge3 tests as root
command: |
Expand Down
28 changes: 16 additions & 12 deletions .circleci/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,22 @@ if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then
export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u)
fi

ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts"
if [[ "${DOCKERIMAGE}" != "miniforge3" ]]; then

mkdir -p "$ARTIFACTS"
DONE_CANARY="$ARTIFACTS/conda-forge-build-done"
rm -f "$DONE_CANARY"
ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts"

docker run -it \
-v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \
-e HOST_USER_ID \
`docker images -q condaforge/$DOCKERIMAGE` \
bash \
/home/conda/feedstock_root/.circleci/test_docker_container.sh
mkdir -p "$ARTIFACTS"
DONE_CANARY="$ARTIFACTS/conda-forge-build-done"
rm -f "$DONE_CANARY"

docker run -it \
-v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \
-e HOST_USER_ID \
`docker images -q condaforge/$DOCKERIMAGE` \
bash \
/home/conda/feedstock_root/.circleci/test_docker_container.sh

# verify that the end of the script was reached
test -f "$DONE_CANARY"
fi

# verify that the end of the script was reached
test -f "$DONE_CANARY"
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ matrix:
- DOCKERTAG=10.2
- CUDA_VER=10.2

- os: linux
env:
- DOCKERIMAGE=miniforge3
- DOCKERTAG=latest

env:
global:
secure: "nM8OaFilQkH14wzD1S6DTGejjo3yL/q/1dpz7144Kw68s8FVqW0zsxCC6960ieokY2LutGSv16qTiIFxnRZnHPCXt7X2MhxcagX8IcMu62DWe2jgqwho0hPI65N/bQYLW1l23e9tjKQxWFZopM4Oyzm6TBqlzibTdbPuQI+YB3RBY0dlkIlupPIYtiNlLRR/HnOyyUny/hg3Z65GWeVpXhiMPqXLlfliTiQ31JgBaNuXiP3/ruSCDeyRPWx62IcPGJ1xVSXL3tvkEI2TpGVCsraKCSbgINhm3AHjQ+8ST6GPMxaOaHrKZzssKJpsZhz1dzWINXTLOQ5LrKtBVwfaevFxDmPEr9RcVlzwAAyuWugCyV4Z6NSt/j2Qqw5qGaiiDHyBH0FMmBgzlPzLZ4JKFsZ68aRkc2qV0MeN0YJRwcQ0EnXRULrcwReBztDHZwixSxqlPpQUwbRr7ne05rBjVoMTKaEhyHPO+KYSwQB1wiQgILBtlP/5ofsYc9Eb46m5JJJhJxuLythKpW9mMqd/US4rQrgEHQ/QRIRYwzGnKf/5WXV3W2o4C9QZpH5Da3J7jOLlqxIY5I+Dv9eEk7XxhT7UaEo7C9tmzjaL2D0yrzPnOnPQhMpmCVNWqdTp1eLcIASKSPbmzz8MuYB5yg48wjXWvDIRBQ6hJyuKHhNGE9k="
Expand Down
File renamed without changes.

0 comments on commit 8ae623a

Please sign in to comment.