Skip to content

CLOUD-483: Use google container builder to build docker image #117

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

Merged
merged 3 commits into from
Jan 31, 2018
Merged

CLOUD-483: Use google container builder to build docker image #117

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed06438
CLOUD-483: Use google container builder to build docker image
ClementGautier Jan 31, 2018
2bbb519
Update Jenkinsfile
ClementGautier Jan 31, 2018
b73fb44
Update Jenkinsfile
ClementGautier Jan 31, 2018
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
20 changes: 5 additions & 15 deletions .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,10 +441,9 @@ def withBuildNode(String phpVersion, body) {
podTemplate(name: "php-api-client-node", label: "build-" + uuid, containers: [
containerTemplate(
name: "docker",
image: "paulwoelfel/docker-gcloud",
image: "paulwoelfel/docker-gcloud:v1.13",
ttyEnabled: true,
command: 'cat',
envVars: [envVar(key: "DOCKER_API_VERSION", value: "1.23")],
resourceRequestCpu: '100m', resourceRequestMemory: '200Mi'),
containerTemplate(
name: "php",
Expand All @@ -456,8 +455,6 @@ def withBuildNode(String phpVersion, body) {
envVar(key: "COMPOSER_AUTH", value: "{\"github-oauth\":{\"github.com\": \"$token\"}}")],
resourceRequestCpu: '500m',
resourceRequestMemory: '1000Mi')
], volumes: [
hostPathVolume(hostPath: "/var/run/docker.sock", mountPath: "/var/run/docker.sock")
]) {
node("build-" + uuid) {
dir('/home/jenkins') {
Expand All @@ -483,14 +480,12 @@ def withDockerGcloud(body) {
podTemplate(name: "php-api-client-gcloud", label: "dockergcloud-" + uuid, containers: [
containerTemplate(
name: "docker",
image: "paulwoelfel/docker-gcloud",
image: "paulwoelfel/docker-gcloud:v1.13",
ttyEnabled: true,
command: 'cat',
resourceRequestCpu: '100m',
resourceRequestMemory: '200Mi',
envVars: [envVar(key: "DOCKER_API_VERSION", value: "1.23")])
], volumes: [
hostPathVolume(hostPath: "/var/run/docker.sock", mountPath: "/var/run/docker.sock")
resourceRequestMemory: '200Mi'
)
]) {
node("dockergcloud-" + uuid) {
container("docker") {
Expand Down Expand Up @@ -601,10 +596,6 @@ def queue(String phpApiImageName, String pimImageName, String pimVersion, String
}]
}]
""")
], volumes: [
hostPathVolume(hostPath: "/var/run/docker.sock", mountPath: "/var/run/docker.sock"),
hostPathVolume(hostPath: "/usr/bin/docker", mountPath: "/usr/bin/docker")

]) {
node("pubsub-" + uuid) {
def messages = body()
Expand Down Expand Up @@ -666,8 +657,7 @@ def clearTemplateNames() {
def saveDockerData(String gcrName, String gCloudcontainerName = "docker") {
container(gCloudcontainerName) {
sh "echo 'FROM alpine:3.6\nADD . /data\n' > Dockerfile"
sh "docker build -t ${gcrName} ."
sh "gcloud docker -- push ${gcrName}"
sh "gcloud container builds submit --tag ${gcrName} ."
}
}

Expand Down