Skip to content
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.

Sign up for GitHub

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

Add cloudbuild configuration for automatic docker image builds #25

Merged
merged 6 commits into from
Jun 23, 2020
Merged

Add cloudbuild configuration for automatic docker image builds #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7240b4b
cloudbuild config and generation script
Jun 22, 2020
a18cb8b
Merge branch 'master' into aslone/cloudbuild
Jun 22, 2020
7209c90
minor typo corrections
Jun 22, 2020
0b60de4
updates responding to PR review
Jun 23, 2020
b0d013c
forgot to add this file to last commit
Jun 23, 2020
4b7b43c
fix default miniconda version in base dockerfile
Jun 23, 2020
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
253 changes: 253 additions & 0 deletions cloudbuild.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
{
"steps": [
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda100",
"name": "gcr.io/cloud-builders/docker",
"args": [
"build",
"-t",
"gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda100",
"-f",
"dockerfiles/Dockerfile.gpu",
"--build-arg",
"CUDA=10.0",
"."
],
"waitFor": [
"-"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda100-push",
"name": "gcr.io/cloud-builders/docker",
"args": [
"push",
"gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda100"
],
"waitFor": [
"gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda100"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda101",
"name": "gcr.io/cloud-builders/docker",
"args": [
"build",
"-t",
"gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda101",
"-f",
"dockerfiles/Dockerfile.gpu",
"--build-arg",
"CUDA=10.1",
"."
],
"waitFor": [
"-"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda101-push",
"name": "gcr.io/cloud-builders/docker",
"args": [
"push",
"gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda101"
],
"waitFor": [
"gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda101"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:cpu-py37",
"name": "gcr.io/cloud-builders/docker",
"args": [
"build",
"-t",
"gcr.io/blueshift-playground/cloudbuild_test:cpu-py37",
"-f",
"dockerfiles/Dockerfile",
"--build-arg",
"BASE_IMAGE=ubuntu:18.04",
"--build-arg",
"PYTHON_VERSION=3.7",
"--build-arg",
"MINICONDA_VERSION=py37_4.8.2",
"."
],
"waitFor": [
"-"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:cpu-py37-push",
"name": "gcr.io/cloud-builders/docker",
"args": [
"push",
"gcr.io/blueshift-playground/cloudbuild_test:cpu-py37"
],
"waitFor": [
"gcr.io/blueshift-playground/cloudbuild_test:cpu-py37"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:cpu-py38",
"name": "gcr.io/cloud-builders/docker",
"args": [
"build",
"-t",
"gcr.io/blueshift-playground/cloudbuild_test:cpu-py38",
"-f",
"dockerfiles/Dockerfile",
"--build-arg",
"BASE_IMAGE=ubuntu:18.04",
"--build-arg",
"PYTHON_VERSION=3.8",
"--build-arg",
"MINICONDA_VERSION=py38_4.8.2",
"."
],
"waitFor": [
"-"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:cpu-py38-push",
"name": "gcr.io/cloud-builders/docker",
"args": [
"push",
"gcr.io/blueshift-playground/cloudbuild_test:cpu-py38"
],
"waitFor": [
"gcr.io/blueshift-playground/cloudbuild_test:cpu-py38"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda100-py37",
"name": "gcr.io/cloud-builders/docker",
"args": [
"build",
"-t",
"gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda100-py37",
"-f",
"dockerfiles/Dockerfile",
"--build-arg",
"BASE_IMAGE=gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda100",
"--build-arg",
"PYTHON_VERSION=3.7",
"--build-arg",
"MINICONDA_VERSION=py37_4.8.2",
"."
],
"waitFor": [
"gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda100"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda100-py37-push",
"name": "gcr.io/cloud-builders/docker",
"args": [
"push",
"gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda100-py37"
],
"waitFor": [
"gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda100-py37"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda101-py37",
"name": "gcr.io/cloud-builders/docker",
"args": [
"build",
"-t",
"gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda101-py37",
"-f",
"dockerfiles/Dockerfile",
"--build-arg",
"BASE_IMAGE=gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda101",
"--build-arg",
"PYTHON_VERSION=3.7",
"--build-arg",
"MINICONDA_VERSION=py37_4.8.2",
"."
],
"waitFor": [
"gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda101"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda101-py37-push",
"name": "gcr.io/cloud-builders/docker",
"args": [
"push",
"gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda101-py37"
],
"waitFor": [
"gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda101-py37"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda100-py38",
"name": "gcr.io/cloud-builders/docker",
"args": [
"build",
"-t",
"gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda100-py38",
"-f",
"dockerfiles/Dockerfile",
"--build-arg",
"BASE_IMAGE=gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda100",
"--build-arg",
"PYTHON_VERSION=3.8",
"--build-arg",
"MINICONDA_VERSION=py38_4.8.2",
"."
],
"waitFor": [
"gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda100"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda100-py38-push",
"name": "gcr.io/cloud-builders/docker",
"args": [
"push",
"gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda100-py38"
],
"waitFor": [
"gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda100-py38"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda101-py38",
"name": "gcr.io/cloud-builders/docker",
"args": [
"build",
"-t",
"gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda101-py38",
"-f",
"dockerfiles/Dockerfile",
"--build-arg",
"BASE_IMAGE=gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda101",
"--build-arg",
"PYTHON_VERSION=3.8",
"--build-arg",
"MINICONDA_VERSION=py38_4.8.2",
"."
],
"waitFor": [
"gcr.io/blueshift-playground/cloudbuild_test:gpu-base-cuda101"
]
},
{
"id": "gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda101-py38-push",
"name": "gcr.io/cloud-builders/docker",
"args": [
"push",
"gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda101-py38"
],
"waitFor": [
"gcr.io/blueshift-playground/cloudbuild_test:gpu-cuda101-py38"
]
}
],
"timeout": "86400s"
}
16 changes: 11 additions & 5 deletions dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ FROM $BASE_IMAGE
MAINTAINER Sam Ritchie <[email protected]>

ARG GCLOUD_LOC=/usr/local/gcloud
ARG PYTHON_VERSION=3.7

# minicoda release archive is here: https://repo.anaconda.com/miniconda
# see the docs here for managing python versions with conda:
# https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-python.html
ARG MINICONDA_VERSION=py37_4.8.2

LABEL maintainer="[email protected]"

Expand All @@ -44,9 +50,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
git \
python3 \
python3-virtualenv \
wget \
&& apt-get clean && \
ajslone marked this conversation as resolved.
Show resolved Hide resolved
&& rm -rf /var/lib/apt/lists/*
wget && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# Some tools expect a "python" binary.
RUN ln -s $(which python3) /usr/local/bin/python
Expand All @@ -71,15 +77,15 @@ ENV PATH $PATH:${GCLOUD_LOC}/google-cloud-sdk/bin
COPY scripts/bashrc /etc/bash.bashrc

# Install Miniconda and prep the system to activate our custom environment.
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.2-Linux-x86_64.sh -O ~/miniconda.sh && \
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh -O ~/miniconda.sh && \
/bin/bash ~/miniconda.sh -b -p /opt/conda && \
rm ~/miniconda.sh && \
/opt/conda/bin/conda clean -tipsy && \
ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \
echo ". /opt/conda/etc/profile.d/conda.sh" >> /etc/bash.bashrc && \
echo "conda activate caliban" >> /etc/bash.bashrc

RUN yes | /opt/conda/bin/conda create --name caliban python=3.7 && /opt/conda/bin/conda clean --all
RUN yes | /opt/conda/bin/conda create --name caliban python=${PYTHON_VERSION} && /opt/conda/bin/conda clean --all

# This allows a user to install packages in the conda environment once it
# launches.
Expand Down
Loading