-
Notifications
You must be signed in to change notification settings - Fork 244
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[docker] Add config support for docker prefix and root image (#10347)
* Switch to Artifact Registry (#29) * config.mk: use AR docker image * build.yaml: use AR for images * Gitignore artifacts * fetch-image.sh: gcloud auth for AR * image-fetcher dockerfile: base on AR * image fetcher make file: use AR * build-batch-worker-image-startup.sh: add gcloud auth configure-docker for AR, user AR for images * batch worker: ue AR for public_gcr_images * Worker dockerfile: use AR * ci build.py: add gcloud auth configure-docker for AR, use AR base image * Makefiles: use AR docker images * stat-permissions.sh: fix for macOS gnu-grep * third-party dockers: use AR * ci dockerFile create_namespace: use AR image * Docker hail-ubuntu: use AR image * ci build.py: add region into the jinja render config for Dockerfiles * CI deploy config: add region * Python-dill: use AR image * Auth deployment.yaml: add REGION * Use hail-dvc default ci image pointer * Add Artifact Registry in main.tf * Add AR in dev-docs * Add AR for ukbb-rg * Add AR in more makefiles * Fix AR usage for image-fetcher * Specify "region" in the "hail-ubuntu-stmp" target. * Fix zone assignment in startup script. * Allow ci to read from Artifact Registry. * Makefiles: parametrise `DOCKER_ROOT_IMAGE` to support both GCR and AR * Parametrise `DOCKER_PREFIX` to support both GCR and AR * Un-gitignore "vlad" * Fix * batch: pass DOCKER_PREFIX to worker * DOCKER_PREFIX in build-batch-worker-image-startup.sh * build.yaml: add ubuntu tags back * ci/ci/build.py: parametrise docker prefix * infra README: configure-docker AR Co-authored-by: Leonhard Gruenschloss <leonhard.gruenschloss@populationgenomics.org.au> * Fix building worker image (#40) * Add Artifact Registry permissions for the batch-agent service account. * Gitignore */hail.jar and *.dylib * Comment in gitignore on dylib * Default use_artifact_registry to false * Use DOCKER_ROOT_IMAGE to pass to batch worker image * Use DOCKER_ROOT_IMAGE wherever makes sense * Render build-batch-worker-image-startup.sh with Jinja to set up docker root image * Fix jinja params * Add phony rule to configure gcloud and Docker * Add comments on HAIL_DOCKER_PREFIX * Make sure the env variable HAIL_DOCKER_PREFIX available to the batch worker instance * Add missing docker_root_image * Infra README: correct env var name * Fix env var case * remove other instances of gcr.io in favor of DOCKER_PREFIX * add hail_version to gitignore once and for all * debug * add back yaml changes after rebase * remove gcloud target from hail/Makefile Co-authored-by: Vlad Savelyev <vladislav.sav@gmail.com> Co-authored-by: Leonhard Gruenschloss <leonhard.gruenschloss@populationgenomics.org.au> Co-authored-by: vladsaveliev <vladislav.savelyev@populationgenomics.org.au>
- Loading branch information
1 parent
f9bcf97
commit 6dfb499
Showing
51 changed files
with
259 additions
and
138 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
from typing import List | ||
|
||
|
||
def public_gcr_images(project: str) -> List[str]: | ||
def public_gcr_images(docker_prefix: str) -> List[str]: | ||
# the worker cannot import batch_configuration because it does not have all the environment | ||
# variables | ||
return [f'gcr.io/{project}/{name}' for name in ('query', 'hail', 'python-dill', 'batch-worker')] | ||
return [f'{docker_prefix}/{name}' for name in ('query', 'hail', 'python-dill', 'batch-worker')] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM gcr.io/{{ global.project }}/ubuntu:18.04 | ||
FROM {{ global.docker_root_image }} | ||
|
||
ENV LANG C.UTF-8 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.