Skip to content
This repository has been archived by the owner on Aug 30, 2024. It is now read-only.

Commit

Permalink
Remove all references to debian jessie
Browse files Browse the repository at this point in the history
  • Loading branch information
sharifelgamal committed Apr 1, 2019
1 parent 9196549 commit c80b5e1
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 24 deletions.
10 changes: 5 additions & 5 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ load(
package_manager_repositories()

# The Debian snapshot datetime to use. See http://snapshot.debian.org/ for more information.
DEB_SNAPSHOT = "20190227T154250Z"
DEB_SNAPSHOT = "20190401T163819Z"

dpkg_src(
name = "debian_jessie",
name = "debian_stretch",
arch = "amd64",
distro = "jessie",
sha256 = "7240a1c6ce11c3658d001261e77797818e610f7da6c2fb1f98a24fdbf4e8d84c",
distro = "stretch",
sha256 = "79a66cd92ba9096fce679e15d0b5feb9effcf618b0a6d065eb32684dbffd0311",
snapshot = DEB_SNAPSHOT,
url = "http://snapshot.debian.org/archive",
)
Expand All @@ -135,7 +135,7 @@ dpkg_list(
"wget",
],
sources = [
"@debian_jessie//file:Packages.json",
"@debian_stretch//file:Packages.json",
],
)

Expand Down
7 changes: 2 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ usage() {
echo "Usage: $0 [-r repository] [-v version] [-c config] [-o os]"
echo
echo "[repository]: remote repository to push the debian image to (e.g. 'gcr.io/gcp-runtimes/debian')"
echo "[version]: version of debian to build (e.g. 'jessie')"
echo "[version]: version of debian to build (e.g. 'stretch')"
echo "[config]: the yaml file defining the steps of the build, defaults to cloudbuild.yaml"
echo "[os]: which image to build, either debian or ubuntu. defaults to debian."
echo
Expand Down Expand Up @@ -75,10 +75,7 @@ if [ -z "$REPO" ] || [ -z "$VERSION" ]; then
usage
fi

if [ "$VERSION" == "jessie" ]
then
export VERSION_NUMBER=8
elif [ "$VERSION" == "stretch" ]
if [ "$VERSION" == "stretch" ]
then
export VERSION_NUMBER=9
elif [ "$VERSION" == "buster" ]
Expand Down
6 changes: 3 additions & 3 deletions debian/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# All items surrounded by ${} are variables to be replaced with real values.
# ${_REPO}: The repository to push debian to, e.g. gcr.io/myproject
# ${_TAG}: What the tag the image with, e.g. latest
# ${_VERSION}: The version of debian to build, e.g. jessie
# ${_VERSION_NUMBER}: The version number associated with the ${_VERSION} string, e.g. 8 for jessie
# ${_VERSION}: The version of debian to build, e.g. stretch
# ${_VERSION_NUMBER}: The version number associated with the ${_VERSION} string, e.g. 9 for stretch
steps:
- name: gcr.io/gcp-runtimes/check_if_tag_exists
args:
Expand Down Expand Up @@ -34,5 +34,5 @@ steps:
- name: gcr.io/gcp-runtimes/structure_test
args: [
'--image', '${_REPO}/debian${_VERSION_NUMBER}:${_TAG}',
'--config', '/workspace/tests/debian_${_VERSION_NUMBER}_test.yaml']
'--config', '/workspace/tests/debian_${_VERSION_NUMBER}_test.yaml']
images: ['${_REPO}/mkdebootstrap:${_VERSION}', '${_REPO}/debian${_VERSION_NUMBER}:${_TAG}']
1 change: 0 additions & 1 deletion debian/reproducible/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ DEBIAN_ENV = {
}

DEBIAN_MAP = {
8: "jessie",
9: "stretch",
}

Expand Down
2 changes: 1 addition & 1 deletion debian/reproducible/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
steps:
# It's unclear why we need this, but bazel appears to need it sometimes.
- name: 'l.gcr.io/google/debian8:latest'
- name: 'l.gcr.io/google/debian9:latest'
args: ['chmod', 'a+rx', '-R', '/workspace']

# We have to build and load the builder image first, so it can be used in the next step.
Expand Down
4 changes: 2 additions & 2 deletions debian/reproducible/debootstrap.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ debootstrap = rule(
default = "minbase",
),
"distro": attr.string(
default = "jessie",
default = "stretch",
),
"_builder_image": attr.label(
default = Label("//debian/reproducible:builder"),
Expand All @@ -84,7 +84,7 @@ load(
"docker_build",
)

def debootstrap_image(name, variant="minbase", distro="jessie", overlay_tar="", env=None):
def debootstrap_image(name, variant="minbase", distro="stretch", overlay_tar="", env=None):
if not env:
env = {}
rootfs = "%s.rootfs" % name
Expand Down
1 change: 0 additions & 1 deletion tests/debian/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ load("@io_bazel_rules_docker//contrib:test.bzl", "container_test")
exports_files(glob(["*.yaml"]))

DEBIAN_MAP = {
8: "jessie",
9: "stretch",
}

Expand Down
6 changes: 0 additions & 6 deletions tests/debian/debian_8_test.yaml

This file was deleted.

0 comments on commit c80b5e1

Please sign in to comment.