Skip to content

Commit

Permalink
fix: re-require lib/docker/version.rb
Browse files Browse the repository at this point in the history
The verifier doesn't work without it. Not sure why it was removed, but I know base PR was ongoing.

Signed-off-by: Andrew Bobulsky <[email protected]>
  • Loading branch information
RulerOf committed Jul 3, 2024
1 parent 8ea4e37 commit 5c61930
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions lib/docker/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# begin
# require "docker"
#
# # Override API_VERSION constant in docker-api gem to use version 1.24 of the Docker API
# # This override is for the docker-api gem to communicate to the Docker engine on Windows
# module Docker
# VERSION = "0.0.0".freeze
# API_VERSION = "1.24".freeze
# end
# rescue LoadError => e
# logger.debug("[Docker] docker-api gem not found for InSpec verifier. #{e}")
# end
begin
require "docker"

# Override API_VERSION constant in docker-api gem to use version 1.24 of the Docker API
# This override is for the docker-api gem to communicate to the Docker engine on Windows
module Docker
VERSION = "0.0.0".freeze
API_VERSION = "1.24".freeze
end
rescue LoadError => e
logger.debug("[Docker] docker-api gem not found for InSpec verifier. #{e}")
end
2 changes: 1 addition & 1 deletion lib/kitchen/transport/docker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

require_relative "../docker/helpers/inspec_helper"

# require_relative "../../docker/version"
require_relative "../../docker/version"
require_relative "../../train/docker"

module Kitchen
Expand Down

0 comments on commit 5c61930

Please sign in to comment.