Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Dockerfile): Update from ubuntu-18.04 to ubuntu-22.04 #2856

Merged
merged 4 commits into from
Aug 1, 2022
Merged

feat(Dockerfile): Update from ubuntu-18.04 to ubuntu-22.04 #2856

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c548f8
feat(Dockerfile): Update from ubuntu-18.04 to ubuntu-22.04
rnt Jun 14, 2022
d1f05d2
feat: Testing also on ubuntu-22.04
rnt Jul 22, 2022
2b58359
Merge branch 'main' into dockerfile-ubuntu-22.04
rnt Jul 22, 2022
2947b0b
fix: URL where package is maintained continues to be 18.04
rnt Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:22.04
LABEL maintainer="Chef Software, Inc. <[email protected]>"

ARG CHANNEL=stable
Expand All @@ -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 && \
rnt marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
5 changes: 3 additions & 2 deletions omnibus/kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down