diff --git a/Dockerfile b/Dockerfile index 2d73d18..f041ca6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ gcc \ + make \ git \ curl \ openssh-client \ diff --git a/provisioners/ansible/roles/ruby/defaults/main.yml b/provisioners/ansible/roles/ruby/defaults/main.yml index c17492a..9cdd9e0 100644 --- a/provisioners/ansible/roles/ruby/defaults/main.yml +++ b/provisioners/ansible/roles/ruby/defaults/main.yml @@ -1,6 +1,6 @@ --- ruby_dependencies: - - 'ruby-full' + - 'ruby-dev' ruby_install_bundler: true ruby_bundler_version: '2.3.23' ruby_install_user_gems: [] diff --git a/tools/docker/lint.sh b/tools/docker/lint.sh index 9fbbac2..bf14bc0 100644 --- a/tools/docker/lint.sh +++ b/tools/docker/lint.sh @@ -12,10 +12,11 @@ source ${CWD}/../helpers/system.sh source ${CWD}/../helpers/log.sh IMAGE="${IMAGE:-theodore86/vagrantenv-ci}" -TAG="${TAG:-0.1.5}" +TAG="${TAG:-latest}" _linter() { - docker run --platform linux/amd64 \ + docker run \ + --platform "$(get_ostype)/$(uname -m)" \ --rm \ -w /app \ -v "${PWD}:/app" \