Skip to content

Commit bc56281

Browse files
author
Doug Greiman
committed
Move main Dockerfile and supporting files to a subdirectory.
Partially addresses GoogleCloudPlatform#57
1 parent e387a1a commit bc56281

File tree

8 files changed

+6
-6
lines changed

8 files changed

+6
-6
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
cloudbuild.yaml
22
ext_run.sh
3-
interpreters.tar.gz

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ cloud-test: cloud-build integration-tests
3939

4040
.PHONY: local-build
4141
local-build: local-build-interpreters
42-
docker build $(DOCKER_FLAGS) -t "$(IMAGE_NAME)" .
42+
docker build $(DOCKER_FLAGS) -t "$(IMAGE_NAME)" runtime-image
4343

4444
.PHONY: local-build-interpreters
4545
local-build-interpreters:

‎cloudbuild.yaml.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
timeout: 7200s
22
steps:
33
- name: gcr.io/cloud-builders/docker
4-
args: ['build', '--tag=interpreter', '--no-cache', 'python-interpreter-builder']
4+
args: ['build', '--tag=interpreter', '--no-cache', '/workspace/python-interpreter-builder/']
55
- name: interpreter
6-
args: ['cp', '/interpreters.tar.gz', '/workspace/']
6+
args: ['cp', '/interpreters.tar.gz', '/workspace/runtime-image/interpreters.tar.gz']
77
- name: gcr.io/cloud-builders/docker
8-
args: ['build', '--tag=${IMAGE_NAME}', '--no-cache', '.']
8+
args: ['build', '--tag=${IMAGE_NAME}', '--no-cache', '/workspace/runtime-image/']
99
- name: gcr.io/gcp-runtimes/structure_test
1010
args: [
1111
'-i', '${IMAGE_NAME}',

‎python-interpreter-builder/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ build:
66
-docker rm python-interpreter-builder
77
docker run --name python-interpreter-builder google/python-interpreter-builder /bin/bash
88
mkdir -p output
9-
docker cp python-interpreter-builder:/interpreters.tar.gz ../interpreters.tar.gz
9+
docker cp python-interpreter-builder:/interpreters.tar.gz ../runtime-image/interpreters.tar.gz
1010
docker rm python-interpreter-builder

‎runtime-image/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
interpreters.tar.gz

Dockerfile renamed to runtime-image/Dockerfile

File renamed without changes.

resources/apt-packages.txt renamed to runtime-image/resources/apt-packages.txt

File renamed without changes.

scripts/install-apt-packages.sh renamed to runtime-image/scripts/install-apt-packages.sh

File renamed without changes.

0 commit comments

Comments
 (0)