Skip to content

Commit 87fc01d

Browse files
committed
Bump Debian to 12
1 parent 87c0d63 commit 87fc01d

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2018 Google LLC. All rights reserved.
1+
# Copyright 2024 Google LLC. All rights reserved.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -11,16 +11,16 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313

14-
FROM marketplace.gcr.io/google/debian11
14+
FROM marketplace.gcr.io/google/debian12
1515

16-
ENV PACKER_VERSION 1.8.3
17-
ENV PACKER_SHA256 0587f7815ed79589cd9c2b754c82115731c8d0b8fd3b746fe40055d969facba5
18-
ENV PACKER_BINARY /bin/packer
16+
ENV PACKER_VERSION=1.11.2
17+
ENV PACKER_SHA256=ced13efc257d0255932d14b8ae8f38863265133739a007c430cae106afcfc45a
18+
ENV PACKER_BINARY=/bin/packer
1919

20-
ENV CHEF_DIR /chef
21-
ENV PACKER_DIR /packer/templates
22-
ENV TESTS_DIR /tests
23-
ENV KEY_FILE_PATH /service-account.json
20+
ENV CHEF_DIR=/chef
21+
ENV PACKER_DIR=/packer/templates
22+
ENV TESTS_DIR=/tests
23+
ENV KEY_FILE_PATH=/service-account.json
2424

2525
# Installs packages
2626
RUN set -eux \

scripts/build-vm-image.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ python3 "${SCRIPT_DIR}/packergen.py" "${INPUT_TEMPLATE}" > /tmp/template.json
9595

9696
echo "Packer: $("${PACKER_BINARY}" -v)"
9797

98+
# Install googlecompute and chef plugins
99+
"${PACKER_BINARY}" plugins install github.com/hashicorp/googlecompute
100+
"${PACKER_BINARY}" plugins install github.com/hashicorp/chef
101+
98102
# Build the packer command
99103
PACKER_COMMAND=("${PACKER_BINARY}" build -color=false)
100104
PACKER_COMMAND+=(-var "chefdir=${CHEF_DIR}")

scripts/packergen.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
# Install chef-solo via deb package.
2222
INSTALL_CHEF_SOLO = r"""
23-
declare -r VERSION=18.2.7
24-
declare -r SHA256=a4461840de71f08f11f3c65a6d2f40f41d394e98f84979f7a8388ed0b578c666
23+
declare -r VERSION=18.5.0
24+
declare -r SHA256=1918e72eebeea0dd2f7680b08f1362d699b37570431ebca3c1b4fbe40cfc2abb
2525
2626
curl "https://packages.chef.io/files/stable/chef/${VERSION}/debian/11/chef_${VERSION}-1_amd64.deb" -o chef-solo.deb \
2727
&& echo "${SHA256} chef-solo.deb" | sha256sum -c \

0 commit comments

Comments
 (0)