Skip to content

ci: rename dockerfiles for easier updates #766

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ci: rename dockerfiles for easier updates #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions .cloudbuild/cloudbuild-test-a.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,16 @@
timeout: 7200s # 2 hours
substitutions:
_JAVA_SHARED_CONFIG_VERSION: '1.7.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current}
_GRAALVM_A: 'graalvm22_3_jdk11'

steps:
# GraalVM A build
- name: gcr.io/cloud-builders/docker
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_A}.Dockerfile", "."]
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-a.Dockerfile", "."]
dir: .cloudbuild
id: graalvm-a-build
waitFor: ["-"]
- name: gcr.io/gcp-runtimes/structure_test
args:
["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_A}.yaml", "-v"]
["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-a.yaml", "-v"]
waitFor: ["graalvm-a-build"]
- name: gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}
entrypoint: bash
Expand Down
6 changes: 2 additions & 4 deletions .cloudbuild/cloudbuild-test-b.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,16 @@
timeout: 7200s # 2 hours
substitutions:
_JAVA_SHARED_CONFIG_VERSION: '1.7.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current}
_GRAALVM_B: 'graalvm22_3_jdk17'

steps:
# GraalVM B build
- name: gcr.io/cloud-builders/docker
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_B}.Dockerfile", "."]
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-b.Dockerfile", "."]
dir: .cloudbuild
id: graalvm-b-build
waitFor: ["-"]
- name: gcr.io/gcp-runtimes/structure_test
args:
["-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_B}.yaml", "-v"]
["-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-b.yaml", "-v"]
waitFor: ["graalvm-b-build"]
- name: gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}
entrypoint: bash
Expand Down
10 changes: 4 additions & 6 deletions .cloudbuild/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,27 @@
timeout: 7200s # 2 hours
substitutions:
_JAVA_SHARED_CONFIG_VERSION: '1.7.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current}
_GRAALVM_A: 'graalvm22_3_jdk11'
_GRAALVM_B: 'graalvm22_3_jdk17'
steps:
# GraalVM A build
- name: gcr.io/cloud-builders/docker
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_A}.Dockerfile", "."]
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-a.Dockerfile", "."]
dir: .cloudbuild
id: graalvm-a-build
waitFor: ["-"]
- name: gcr.io/gcp-runtimes/structure_test
args:
["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_A}.yaml", "-v"]
["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-a.yaml", "-v"]
waitFor: ["graalvm-a-build"]

# GraalVM B build
- name: gcr.io/cloud-builders/docker
args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_B}.Dockerfile", "." ]
args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-b.Dockerfile", "." ]
dir: .cloudbuild
id: graalvm-b-build
waitFor: [ "-" ]
- name: gcr.io/gcp-runtimes/structure_test
args:
[ "-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_B}.yaml", "-v" ]
[ "-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-b.yaml", "-v" ]
waitFor: [ "graalvm-b-build" ]


Expand Down
0 .cloudbuild/graalvm22_3_jdk11.Dockerfile → .cloudbuild/graalvm-a.Dockerfile
View file
Open in desktop
File renamed without changes.
0 .cloudbuild/graalvm22_3_jdk11.yaml → .cloudbuild/graalvm-a.yaml
View file
Open in desktop
File renamed without changes.
0 .cloudbuild/graalvm22_3_jdk17.Dockerfile → .cloudbuild/graalvm-b.Dockerfile
View file
Open in desktop
File renamed without changes.
0 .cloudbuild/graalvm22_3_jdk17.yaml → .cloudbuild/graalvm-b.yaml
View file
Open in desktop
File renamed without changes.