diff options
| author | gjb <gjb@FreeBSD.org> | 2016-08-08 07:16:13 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-08-08 07:16:13 +0000 |
| commit | 6f5f085a613a783b4320c924756358f42091327d (patch) | |
| tree | b417016602fbab9d9b43379af2b01f4c5d3612be /release | |
| parent | 59daa2995eb19cafbae68936d86b4e16c6db288b (diff) | |
| download | FreeBSD-src-6f5f085a613a783b4320c924756358f42091327d.zip FreeBSD-src-6f5f085a613a783b4320c924756358f42091327d.tar.gz | |
MFC r303782:
Fix GCE image publication. The gcutil utility is deprecated in favor
of gcloud.
Approved by: re (delphij, kib)
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.gce | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/Makefile.gce b/release/Makefile.gce index b6b6577..5bdfb5d 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -35,7 +35,7 @@ gce-check-depends: @false . endif .endfor -.if !exists(/usr/local/bin/gcutil) +.if !exists(/usr/local/bin/gcloud) . if !exists(${PORTSDIR}/net/google-cloud-sdk/Makefile) . if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf @@ -63,7 +63,7 @@ gce-do-upload: /usr/local/bin/gsutil mb gs://${GCE_BUCKET} || true /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \ gs://${GCE_BUCKET}/ - /usr/local/bin/gcutil addimage ${GCE_TARGET} \ - gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz + /usr/local/bin/gcloud compute images create ${GCE_TARGET} \ + --source-uri gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz touch ${.OBJDIR}/${.TARGET} |
