Skip to content

Move build dependencies to setup folder #80

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.

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

Merged
merged 1 commit into from
Mar 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Dockerfile_3.6 → setup/Dockerfile_3.6
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apt-get update && \


WORKDIR /nuscenes-dev
COPY requirements.txt /nuscenes-dev
COPY setup/requirements.txt /nuscenes-dev
# Install Python dependencies inside of the Docker image via Conda.
RUN bash -c "conda create -y -n nuenv python=3.6; source activate nuenv && \
pip install -r /nuscenes-dev/requirements.txt \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_3.7 → setup/Dockerfile_3.7
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apt-get update && \


WORKDIR /nuscenes-dev
COPY requirements.txt /nuscenes-dev
COPY setup/requirements.txt /nuscenes-dev
# Install Python dependencies inside of the Docker image via Conda.
RUN bash -c "conda create -y -n nuenv python=3.7; source activate nuenv && \
pip install -r /nuscenes-dev/requirements.txt \
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile → setup/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pipeline {
// Build the Docker image, and then run python -m unittest inside
// an activated Conda environment inside of the container.
sh """#!/bin/bash
bash test_multiple_docker_imgs.sh
bash setup/test_multiple_docker_imgs.sh
"""
} // container
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash
bash test_mini_split.sh Dockerfile_3.6
bash setup/test_mini_split.sh setup/Dockerfile_3.6
exit_code_3_6="$?"

bash test_mini_split.sh Dockerfile_3.7
bash setup/test_mini_split.sh setup/Dockerfile_3.7
exit_code_3_7="$?"

if [ ${exit_code_3_6} -ne 0 ]; then
Expand Down