Skip to content

Commit

Permalink
Hotfix - Update Dockefile dependencies
Browse files Browse the repository at this point in the history
- Add make binary due to rubocop ~> json dependency
- Update docker/lint.sh to automatically detect os and platform arch
- Change ansible role ruby
  - Update ruby dependency with ruby-dev rather than ruby-full
  • Loading branch information
theodore86 committed Oct 25, 2022
1 parent 77fd790 commit 0e06013
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion provisioners/ansible/roles/ruby/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
ruby_dependencies:
- 'ruby-full'
- 'ruby-dev'
ruby_install_bundler: true
ruby_bundler_version: '2.3.23'
ruby_install_user_gems: []
Expand Down
5 changes: 3 additions & 2 deletions tools/docker/lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down

0 comments on commit 0e06013

Please sign in to comment.