Skip to content

Commit

Permalink
Merge pull request #72 from tuxmea/onceover
Browse files Browse the repository at this point in the history
Add onceover rubygem
  • Loading branch information
rwaffen authored Jan 24, 2025
2 parents cd9ded5 + b4b96c1 commit 7c323dc
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop_performance }}
RUBYGEM_BUNDLER=${{ matrix.rubygem_bundler }}
RUBYGEM_ONCEOVER=${{ matrix.rubygem_onceover }}
build_arch: linux/amd64
docker_username: voxpupulibot
docker_password: ${{ secrets.DOCKERHUB_BOT_PASSWORD }}
Expand Down Expand Up @@ -76,6 +77,7 @@ jobs:
RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop_performance }}
RUBYGEM_BUNDLER=${{ matrix.rubygem_bundler }}
RUBYGEM_ONCEOVER=${{ matrix.rubygem_onceover }}
build_arch: linux/arm64
docker_username: voxpupulibot
docker_password: ${{ secrets.DOCKERHUB_BOT_PASSWORD }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }}
RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
RUBYGEM_BUNDLER=${{ matrix.rubygem_bundler }}
RUBYGEM_ONCEOVER=${{ matrix.rubygem_onceover }}
- name: Clone voxpupuli/puppet-example repository
uses: actions/checkout@v4
Expand Down Expand Up @@ -99,6 +100,7 @@ jobs:
RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }}
RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
RUBYGEM_BUNDLER=${{ matrix.rubygem_bundler }}
RUBYGEM_ONCEOVER=${{ matrix.rubygem_onceover }}
- name: Clone voxpupuli/puppet-example repository
uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/security_scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }}
RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
RUBYGEM_BUNDLER=${{ matrix.rubygem_bundler }}
RUBYGEM_ONCEOVER=${{ matrix.rubygem_onceover }}
- name: Scan image with Anchore Grype
uses: anchore/scan-action@v6
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ ENV RUBYGEM_RUBOCOP_PERFORMANCE=${RUBYGEM_RUBOCOP_PERFORMANCE:-1.23.0}
ARG RUBYGEM_BUNDLER
ENV RUBYGEM_BUNDLER=${RUBYGEM_BUNDLER:-2.5.23}

ARG RUBYGEM_ONCEOVER
ENV RUBYGEM_ONCEOVER=${RUBYGEM_ONCEOVER:-4.0.0}

COPY voxbox/Gemfile /

RUN apk update \
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,16 @@ docker run -it --rm -v $(pwd):/repo ghcr.io/voxpupuli/voxbox:8 # rake -T
docker run -it --rm -v $(pwd):/repo ghcr.io/voxpupuli/voxbox:8 spec # rake spec
```

If you want to run onceover, you have to override the entrypoint:

```shell
docker run -it --rm -v $(pwd):/repo --entrypoint onceover ghcr.io/voxpupuli/voxbox:8 help
```

if you need a shell, you have to override the entrypoint:

```shell
docker run -it --rm -v $(pwd):/repo --entrypoint bash ghcr.io/voxpupuli/voxbox:8
docker run -it --rm -v $(pwd):/repo --entrypoint sh ghcr.io/voxpupuli/voxbox:8
```

### Available rake tasks
Expand Down
6 changes: 4 additions & 2 deletions build_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"rubygem_r10k": "4.1.0",
"rubygem_ra10ke": "3.1.0",
"rubygem_rubocop_performance": "1.22.1",
"rubygem_bundler": "2.4.22"
"rubygem_bundler": "2.4.22",
"rubygem_onceover": "4.0.0"
},
{
"puppet_release": 8,
Expand All @@ -28,7 +29,8 @@
"rubygem_r10k": "4.1.0",
"rubygem_ra10ke": "3.1.0",
"rubygem_rubocop_performance": "1.22.1",
"rubygem_bundler": "2.5.22"
"rubygem_bundler": "2.5.22",
"rubygem_onceover": "4.0.0"
}
]
}
1 change: 1 addition & 0 deletions voxbox/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ gem 'voxpupuli-release', ENV['RUBYGEM_VOXPUPULI_RELEASE']
gem 'voxpupuli-test', ENV['RUBYGEM_VOXPUPULI_TEST']
gem 'rubocop-performance', ENV['RUBYGEM_RUBOCOP_PERFORMANCE']
gem 'ffi', '~> 1.16.3' # ffi 1.17.0 has change dependencies - see https://github.com/ffi/ffi/issues/1105
gem 'onceover', ENV['RUBYGEM_ONCEOVER']

# CVE fixes
gem 'cgi', '~> 0.4.1' # cgi 0.1.0 has CVEs - remove default and install upstream replacement
Expand Down

0 comments on commit 7c323dc

Please sign in to comment.