d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GCE image publication. The gcutil utility is deprecated in favor

Browse Source 
of gcloud.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2016-08-05 19:00:45 +00:00
parent 921d7118e1
commit c63ea09b5c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/Makefile.gce
View File

@ -35,7 +35,7 @@ gce-check-depends:
@false @false
. endif . endif
.endfor .endfor
.if !exists(/usr/local/bin/gcutil) .if !exists(/usr/local/bin/gcloud)
. if !exists(${PORTSDIR}/net/google-cloud-sdk/Makefile) . if !exists(${PORTSDIR}/net/google-cloud-sdk/Makefile)
. if !exists(/usr/local/sbin/pkg-static) . if !exists(/usr/local/sbin/pkg-static)
env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf 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 mb gs://${GCE_BUCKET} || true
/usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \ /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \
gs://${GCE_BUCKET}/ gs://${GCE_BUCKET}/
/usr/local/bin/gcutil addimage ${GCE_TARGET} \ /usr/local/bin/gcloud compute images create ${GCE_TARGET} \
gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz --source-uri gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz
touch ${.OBJDIR}/${.TARGET} touch ${.OBJDIR}/${.TARGET}