Skip to content

Commit 2f94edf

Browse files
authored
Remove vagrant patches
The earlier patches to vagrant turned out to be unneeded.
1 parent 6a6f432 commit 2f94edf

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

Dockerfile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ ARG CHEF_LICENSE=accept
66
# Set any build variables here
77
ARG VAGRANT_VERSION=2.2.19
88

9-
ARG VAGRANT_GEMDIR=/opt/vagrant/embedded/gems/${VAGRANT_VERSION}/
109
ARG CHEF_GEMDIR=/opt/chef-workstation/embedded/lib/ruby/gems/3.0.0/
1110

1211
ARG NET_SSH_PATCH1=f79ed49dc068317fb280bd2fb554ecb0ce13a7e1
@@ -45,14 +44,9 @@ RUN echo "Monkey patching Berkshelf (see https://github.com/berkshelf/berkshelf/
4544
# For more details see https://www.openssh.com/txt/release-8.7
4645
#
4746
# The ruby gem net-ssh needs to be updated to 6.3.0.beta1 + patch to handle this.
48-
# Future releases of test-kitchen and vagrant will probably handle this better.
49-
RUN /opt/vagrant/embedded/bin/gem install net-ssh -v 6.3.0.beta1 --pre --install-dir ${VAGRANT_GEMDIR} && \
50-
/opt/chef-workstation/embedded/bin/gem install net-ssh -v 6.3.0.beta1 --pre --no-user-install --install-dir ${CHEF_GEMDIR} && \
47+
# Future releases of test-kitchen will probably handle this better.
48+
RUN /opt/chef-workstation/embedded/bin/gem install net-ssh -v 6.3.0.beta1 --pre --no-user-install --install-dir ${CHEF_GEMDIR} && \
5149
sed -i 's/gem "net-ssh", "= 6.1.0"/gem "net-ssh", "= 6.3.0.beta1"/' /opt/chef-workstation/bin/kitchen && \
52-
curl https://github.com/net-ssh/net-ssh/commit/${NET_SSH_PATCH1}.diff | filterdiff -p1 -x 'test/*' -x '.rubocop_todo.yml' | \
53-
patch -p1 -d ${VAGRANT_GEMDIR}/gems/net-ssh-6.3.0.beta1 && \
54-
curl https://github.com/net-ssh/net-ssh/commit/${NET_SSH_PATCH2}.diff | filterdiff -p1 -x 'test/*' -x '.rubocop_todo.yml' | \
55-
patch -p1 -d ${VAGRANT_GEMDIR}/gems/net-ssh-6.3.0.beta1 && \
5650
curl https://github.com/net-ssh/net-ssh/commit/${NET_SSH_PATCH1}.diff | filterdiff -p1 -x 'test/*' -x '.rubocop_todo.yml' | \
5751
patch -p1 -d ${CHEF_GEMDIR}/gems/net-ssh-6.3.0.beta1 && \
5852
curl https://github.com/net-ssh/net-ssh/commit/${NET_SSH_PATCH2}.diff | filterdiff -p1 -x 'test/*' -x '.rubocop_todo.yml' | \

0 commit comments

Comments
 (0)