diff options
author | Zach Marano <zmarano@google.com> | 2017-01-10 14:32:09 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-10 14:32:09 -0800 |
commit | 796c879c7755fa340121503b142efa6591b9c801 (patch) | |
tree | 1f88976460850852bebec18461f375467e7dd040 | |
parent | 36cb06ecba72fdd9f8e7105a09531ee38dd7cee1 (diff) | |
download | google-compute-image-packages-796c879c7755fa340121503b142efa6591b9c801.tar.gz |
Add Debian 9 stretch builds for Linux packages. (#368)
-rw-r--r-- | README.md | 35 | ||||
-rwxr-xr-x | build_packages.sh | 7 | ||||
-rwxr-xr-x | google_compute_engine_init/build_packages.sh | 7 | ||||
-rwxr-xr-x | google_config/build_packages.sh | 8 |
4 files changed, 47 insertions, 10 deletions
@@ -269,6 +269,7 @@ Distro | Package Type | Python Version | Init System ------------ | ------------ | -------------- | ----------- Debian 7 | deb | 2.7 | sysvinit Debian 8 | deb | 2.7 | systemd +Debian 9 | deb | 2.7 | systemd CentOS 6 | rpm | 2.6 | upstart CentOS 7 | rpm | 2.7 | systemd RHEL 6 | rpm | 2.6 | upstart @@ -302,10 +303,10 @@ The package build tools are published in this project. ## Package Distribution The deb and rpm packages used in some GCE images are published to Google Cloud -repositories. Debian 8, CentOS 6 and 7, and RHEL 6 and 7 use these repositories -to install and update the `google-compute-engine`,`google-compute-engine-init`, -and `google-config` packages. If you are creating a custom image, you can also -use these repositories in your image. +repositories. Debian 8, Debian 9, CentOS 6 and 7, and RHEL 6 and 7 use these +repositories to install and update the `google-compute-engine`, +`google-compute-engine-init`, and `google-config` packages. If you are creating +a custom image, you can also use these repositories in your image. **For Debian 8, run the following commands as root:** @@ -333,6 +334,32 @@ Install the `google-compute-engine-jessie`, apt-get update; apt-get install -y google-config-jessie google-compute-engine-jessie google-compute-engine-init-jessie ``` +**For Debian 9, run the following commands as root:** + +Add the public repo key to your system: +``` +curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - +``` + +Add a source list file `/etc/apt/sources.list.d/google-cloud.list`: +``` +tee /etc/apt/sources.list.d/google-cloud.list << EOM +deb http://packages.cloud.google.com/apt google-cloud-compute-stretch main +deb http://packages.cloud.google.com/apt google-cloud-packages-archive-keyring-stretch main +EOM +``` + +Install the packages to maintain the public key over time: +``` +apt-get update; apt-get install google-cloud-packages-archive-keyring +``` + +Install the `google-compute-engine-stretch`, +`google-compute-engine-init-stretch`, and `google-config-stretch` packages: +``` +apt-get update; apt-get install -y google-config-stretch google-compute-engine-stretch google-compute-engine-init-stretch +``` + **For EL6 and EL7 based distributions, run the following commands as root:** Add the yum repo to a repo file `/etc/yum.repos.d/google-cloud.repo` for either diff --git a/build_packages.sh b/build_packages.sh index 4298995..a2c5cef 100755 --- a/build_packages.sh +++ b/build_packages.sh @@ -78,7 +78,7 @@ while getopts 'ho:' OPTION; do done if [ -z "$BUILD" ]; then - BUILD=('el6' 'el7' 'wheezy' 'jessie') + BUILD=('el6' 'el7' 'jessie' 'stretch') fi for build in "${BUILD[@]}"; do @@ -95,8 +95,11 @@ for build in "${BUILD[@]}"; do jessie) # Debian 8 build_distro 'jessie' 'deb' '/usr/lib/python2.7/dist-packages' ;; + stretch) # Debian 9 + build_distro 'stretch' 'deb' '/usr/lib/python2.7/dist-packages' + ;; *) - echo "Invalid build '${build}'. Use 'el6', 'el7', 'wheezy', or 'jessie'." + echo "Invalid build '${build}'. Use 'el6', 'el7', 'wheezy', 'jessie', or 'stretch'." ;; esac done diff --git a/google_compute_engine_init/build_packages.sh b/google_compute_engine_init/build_packages.sh index 94a0146..552447e 100755 --- a/google_compute_engine_init/build_packages.sh +++ b/google_compute_engine_init/build_packages.sh @@ -96,7 +96,7 @@ while getopts 'ho:' OPTION; do done if [ -z "$BUILD" ]; then - BUILD=('el6' 'el7' 'wheezy' 'jessie') + BUILD=('el6' 'el7' 'jessie' 'stretch') fi for build in "${BUILD[@]}"; do @@ -113,8 +113,11 @@ for build in "${BUILD[@]}"; do jessie) # Debian 8 build_distro 'jessie' 'deb' 'systemd' '/usr/lib/systemd/system' ;; + stretch) # Debian 9 + build_distro 'stretch' 'deb' 'systemd' '/usr/lib/systemd/system' + ;; *) - echo "Invalid build '${build}'. Use 'el6', 'el7', 'wheezy', or 'jessie'." + echo "Invalid build '${build}'. Use 'el6', 'el7', 'wheezy', 'jessie', or 'stretch'." ;; esac done diff --git a/google_config/build_packages.sh b/google_config/build_packages.sh index 7ce1389..ae19def 100755 --- a/google_config/build_packages.sh +++ b/google_config/build_packages.sh @@ -78,7 +78,7 @@ while getopts 'ho:' OPTION; do done if [ -z "$BUILD" ]; then - BUILD=('el6' 'el7' 'wheezy' 'jessie') + BUILD=('el6' 'el7' 'jessie' 'stretch') fi for build in "${BUILD[@]}"; do @@ -101,8 +101,12 @@ for build in "${BUILD[@]}"; do build_distro 'jessie' 'deb' \ 'bin/set_hostname=/etc/dhcp/dhclient-exit-hooks.d/set_hostname' ;; + stretch) # Debian 9 + build_distro 'stretch' 'deb' \ + 'bin/set_hostname=/etc/dhcp/dhclient-exit-hooks.d/set_hostname' + ;; *) - echo "Invalid build '${build}'. Use 'el6', 'el7', 'wheezy', or 'jessie'." + echo "Invalid build '${build}'. Use 'el6', 'el7', 'wheezy', 'jessie', or 'stretch'." ;; esac done |