Skip to content

Commit

Permalink
Prepare release (#28)
Browse files Browse the repository at this point in the history
* Update dockerfile

* Update cloudbuild.yaml

* Use cloud-lifesciences as our public container registry project

* First round of comments
  • Loading branch information
samanvp authored Sep 9, 2019
1 parent b1cbbc9 commit 0982cae
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 25 deletions.
15 changes: 2 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,20 @@
# the Google Cloud Platform.

# Install pipelines tool.
FROM golang:1.10
ENV GOPATH /go
FROM golang:1.11
RUN go get github.com/googlegenomics/pipelines-tools/pipelines


FROM google/cloud-sdk:alpine

# Copy pipelines tool from the previous step.
ENV GOPATH /go
COPY --from=0 /go/ $GOPATH
ENV PATH $PATH:$GOPATH/bin
COPY --from=0 /go/bin/pipelines /usr/bin

RUN apk add --update python3 python3-dev build-base && \
ln -sf python3 /usr/bin/python && \
pip3 install --upgrade pip enum34 retrying google-api-core google-cloud-storage && \
mkdir -p /opt/deepvariant_runner/bin && \
mkdir -p /opt/deepvariant_runner/src

# Kubernetes TPU is in beta.
RUN gcloud components install beta -q

# Install kubernetes.
RUN curl -L -o /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest.txt)/bin/linux/amd64/kubectl && \
chmod +x /usr/bin/kubectl

ADD LICENSE /
ADD gcp_deepvariant_runner.py /opt/deepvariant_runner/src/
ADD gke_cluster.py /opt/deepvariant_runner/src/
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild-release.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
substitutions:
_PUBLIC_PROJECT_ID: cloud-genomics-pipelines
_PUBLIC_PROJECT_ID: cloud-lifesciences

steps:
- name: 'gcr.io/cloud-builders/docker'
Expand Down
12 changes: 1 addition & 11 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
substitutions:
_MODEL: gs://deepvariant/models/DeepVariant/0.7.2/DeepVariant-inception_v3-0.7.2+data-wgs_standard
_MODEL: gs://deepvariant/models/DeepVariant/0.8.0/DeepVariant-inception_v3-0.8.0+data-wgs_standard

steps:
- name: 'gcr.io/cloud-builders/docker'
Expand Down Expand Up @@ -30,14 +30,4 @@ steps:
- '${_MODEL}'
- 'gpu'

- name: 'gcr.io/${PROJECT_ID}/gcp-deepvariant-runner:${COMMIT_SHA}'
id: 'test-image-tpu'
args:
- 'bash'
- '/opt/deepvariant_runner/bin/run_and_verify.sh'
- '${PROJECT_ID}'
- '${COMMIT_SHA}'
- '${_MODEL}'
- 'tpu'

timeout: 2h

0 comments on commit 0982cae

Please sign in to comment.