From 1c548f8563db95e242fe020d7207f84684a1a202 Mon Sep 17 00:00:00 2001 From: Renato Covarrubias Date: Tue, 14 Jun 2022 19:34:02 -0400 Subject: [PATCH 1/3] feat(Dockerfile): Update from ubuntu-18.04 to ubuntu-22.04 Signed-off-by: Renato Covarrubias --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9166a6843..381411f1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:22.04 LABEL maintainer="Chef Software, Inc. " ARG CHANNEL=stable @@ -21,7 +21,7 @@ ENV LANG=en_US.UTF-8 \ RUN apt-get update && \ apt-get install -y gcc git graphviz make rsync ssh vim-tiny wget && \ ln -s /usr/bin/vi /usr/bin/vim && \ - wget --content-disposition "http://packages.chef.io/files/${CHANNEL}/chef-workstation/${VERSION}/ubuntu/18.04/chef-workstation_${VERSION}-1_amd64.deb" -O /tmp/chef-workstation.deb && \ + wget --content-disposition "http://packages.chef.io/files/${CHANNEL}/chef-workstation/${VERSION}/ubuntu/22.04/chef-workstation_${VERSION}-1_amd64.deb" -O /tmp/chef-workstation.deb && \ dpkg -i /tmp/chef-workstation.deb && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/*log /var/log/apt/* /var/lib/dpkg/*-old /var/cache/debconf/*-old From d1f05d29abdb1745b05a755278d94fe407a531d3 Mon Sep 17 00:00:00 2001 From: Renato Covarrubias Date: Fri, 22 Jul 2022 12:08:39 -0400 Subject: [PATCH 2/3] feat: Testing also on ubuntu-22.04 --- omnibus/kitchen.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/omnibus/kitchen.yml b/omnibus/kitchen.yml index 39df950f8..16b902494 100644 --- a/omnibus/kitchen.yml +++ b/omnibus/kitchen.yml @@ -9,8 +9,8 @@ driver: forward_agent: yes synced_folders: - ['..', '/home/vagrant/chef-workstation'] - - ['../../omnibus', '/home/vagrant/omnibus'] - - ['../../omnibus-software', '/home/vagrant/omnibus-software'] + - ['../../omnibus', '/home/vagrant/omnibus'] + - ['../../omnibus-software', '/home/vagrant/omnibus-software'] customize: cpus: 6 memory: 4096 @@ -28,6 +28,7 @@ platforms: - name: centos-7 - name: debian-9 - name: ubuntu-18.04 + - name: ubuntu-22.04 - name: windows-2012r2-standard provisioner: attributes: From 2947b0bdf9d5275c746fc0a713d417fe9c09e0b6 Mon Sep 17 00:00:00 2001 From: Renato Covarrubias Date: Thu, 28 Jul 2022 16:57:38 -0400 Subject: [PATCH 3/3] fix: URL where package is maintained continues to be 18.04 Signed-off-by: Renato Covarrubias --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 32c53b96a..82e2c53d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ ENV LANG=en_US.UTF-8 \ RUN apt-get update && \ apt-get install -y gcc git graphviz make rsync ssh vim-tiny wget && \ ln -s /usr/bin/vi /usr/bin/vim && \ - wget --content-disposition "http://packages.chef.io/files/${CHANNEL}/chef-workstation/${VERSION}/ubuntu/22.04/chef-workstation_${VERSION}-1_amd64.deb" -O /tmp/chef-workstation.deb && \ + wget --content-disposition "http://packages.chef.io/files/${CHANNEL}/chef-workstation/${VERSION}/ubuntu/18.04/chef-workstation_${VERSION}-1_amd64.deb" -O /tmp/chef-workstation.deb && \ dpkg -i /tmp/chef-workstation.deb && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/*log /var/log/apt/* /var/lib/dpkg/*-old /var/cache/debconf/*-old