Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix obscured gemfile issue #912

Merged
merged 1 commit into from
Jul 18, 2024

Conversation

mrmanc
Copy link
Contributor

@mrmanc mrmanc commented Mar 1, 2024

(edited to include just one change per @parkr’s suggestion—see also stacked PR #914)

Fixes #891. jekyll was unable to find the gems which Bundler had installed as part of the Dockerfile because it was finding a Gemfile in the currently working directory (/src/site), which belongs to the site being built. I resolved this by setting an environment variable to tell Bundler where to find the correct Gemfile.

I’m not a Ruby developer, so I might not have done this conventionally. However it seems to work, and it was the minimum change I could make to resolve those issues.

I’ve specified the BUNDLE_GEMFILE as the one that exists in the /src/site location (the source of the site being built) was preventing Jekyll from finding the installed dependencies.
@mrmanc
Copy link
Contributor Author

mrmanc commented Mar 18, 2024

Is there anything else that the team need to support this change? Please let me know if there’s anything else I can do to get it merged.

@@ -9,6 +9,7 @@ class Dependencies
# Jekyll
"jekyll" => "3.9.5",
"jekyll-sass-converter" => "1.5.2",
"webrick" => "1.8.1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that everything is upgraded to Ruby 3, I'd recommend this for sure 👍

@parkr
Copy link
Contributor

parkr commented Mar 18, 2024

I might recommend separating the addition of the webrick and the modification of the docket files into two separate PRs. Otherwise LGTM.

@mrmanc mrmanc force-pushed the fix-obscured-gemfile-issue branch from 4012662 to 7292abd Compare March 22, 2024 13:34
@mrmanc
Copy link
Contributor Author

mrmanc commented Mar 22, 2024

I might recommend separating the addition of the webrick and the modification of the docket files into two separate PRs. Otherwise LGTM.

Thanks—I’ve done as you’ve suggested 😃. I’m guessing you aren’t able to act on this yourself?

@yoannchaudet yoannchaudet merged commit cdd68ab into github:master Jul 18, 2024
@mrmanc mrmanc deleted the fix-obscured-gemfile-issue branch July 18, 2024 13:54
TomHennen referenced this pull request in slsa-framework/slsa Aug 21, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [github-pages](https://togithub.com/github/pages-gem) | `231` -> `232`
|
[![age](https://developer.mend.io/api/mc/badges/age/rubygems/github-pages/232?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/rubygems/github-pages/232?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/rubygems/github-pages/231/232?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/rubygems/github-pages/231/232?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>github/pages-gem (github-pages)</summary>

### [`v232`](https://togithub.com/github/pages-gem/releases/tag/v232)

[Compare
Source](https://togithub.com/github/pages-gem/compare/v231...v232)

#### What's Changed

- Bump docker/build-push-action from 5 to 6 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/github/pages-gem/pull/916](https://togithub.com/github/pages-gem/pull/916)
- Fix obscured gemfile issue by
[@&#8203;mrmanc](https://togithub.com/mrmanc) in
[https://github.com/github/pages-gem/pull/912](https://togithub.com/github/pages-gem/pull/912)
- Add webrick as Ruby 3 doesn’t include it by
[@&#8203;mrmanc](https://togithub.com/mrmanc) in
[https://github.com/github/pages-gem/pull/914](https://togithub.com/github/pages-gem/pull/914)
- Update nokogiri CVE-2024-25062 by
[@&#8203;naxhh](https://togithub.com/naxhh) in
[https://github.com/github/pages-gem/pull/911](https://togithub.com/github/pages-gem/pull/911)
- Parkr jekyll3.10 by
[@&#8203;yoannchaudet](https://togithub.com/yoannchaudet) in
[https://github.com/github/pages-gem/pull/919](https://togithub.com/github/pages-gem/pull/919)
- Fix improperly bound regex by
[@&#8203;yoannchaudet](https://togithub.com/yoannchaudet) in
[https://github.com/github/pages-gem/pull/921](https://togithub.com/github/pages-gem/pull/921)
- Prep 232 by [@&#8203;yoannchaudet](https://togithub.com/yoannchaudet)
in
[https://github.com/github/pages-gem/pull/923](https://togithub.com/github/pages-gem/pull/923)

#### New Contributors

- [@&#8203;naxhh](https://togithub.com/naxhh) made their first
contribution in
[https://github.com/github/pages-gem/pull/911](https://togithub.com/github/pages-gem/pull/911)

**Full Changelog**:
github/pages-gem@v231...v232

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "every weekend" (UTC), Automerge - At
any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View the
[repository job
log](https://developer.mend.io/github/slsa-framework/slsa).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

---------

Signed-off-by: Mend Renovate <[email protected]>
Signed-off-by: Tom Hennen <[email protected]>
Co-authored-by: Tom Hennen <[email protected]>
andrewpollock referenced this pull request in google/osv-scanner Aug 22, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [github-pages](https://togithub.com/github/pages-gem) | `"~> 231"` ->
`"~> 232"` |
[![age](https://developer.mend.io/api/mc/badges/age/rubygems/github-pages/232?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/rubygems/github-pages/232?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/rubygems/github-pages/231/232?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/rubygems/github-pages/231/232?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>github/pages-gem (github-pages)</summary>

### [`v232`](https://togithub.com/github/pages-gem/releases/tag/v232)

[Compare
Source](https://togithub.com/github/pages-gem/compare/v231...v232)

#### What's Changed

- Bump docker/build-push-action from 5 to 6 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/github/pages-gem/pull/916](https://togithub.com/github/pages-gem/pull/916)
- Fix obscured gemfile issue by
[@&#8203;mrmanc](https://togithub.com/mrmanc) in
[https://github.com/github/pages-gem/pull/912](https://togithub.com/github/pages-gem/pull/912)
- Add webrick as Ruby 3 doesn’t include it by
[@&#8203;mrmanc](https://togithub.com/mrmanc) in
[https://github.com/github/pages-gem/pull/914](https://togithub.com/github/pages-gem/pull/914)
- Update nokogiri CVE-2024-25062 by
[@&#8203;naxhh](https://togithub.com/naxhh) in
[https://github.com/github/pages-gem/pull/911](https://togithub.com/github/pages-gem/pull/911)
- Parkr jekyll3.10 by
[@&#8203;yoannchaudet](https://togithub.com/yoannchaudet) in
[https://github.com/github/pages-gem/pull/919](https://togithub.com/github/pages-gem/pull/919)
- Fix improperly bound regex by
[@&#8203;yoannchaudet](https://togithub.com/yoannchaudet) in
[https://github.com/github/pages-gem/pull/921](https://togithub.com/github/pages-gem/pull/921)
- Prep 232 by [@&#8203;yoannchaudet](https://togithub.com/yoannchaudet)
in
[https://github.com/github/pages-gem/pull/923](https://togithub.com/github/pages-gem/pull/923)

#### New Contributors

- [@&#8203;naxhh](https://togithub.com/naxhh) made their first
contribution in
[https://github.com/github/pages-gem/pull/911](https://togithub.com/github/pages-gem/pull/911)

**Full Changelog**:
github/pages-gem@v231...v232

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 6am on monday" in timezone
Australia/Sydney, Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View the
[repository job
log](https://developer.mend.io/github/google/osv-scanner).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->
lehors referenced this pull request in slsa-framework/slsa Aug 27, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [github-pages](https://togithub.com/github/pages-gem) | `231` -> `232`
|
[![age](https://developer.mend.io/api/mc/badges/age/rubygems/github-pages/232?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/rubygems/github-pages/232?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/rubygems/github-pages/231/232?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/rubygems/github-pages/231/232?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>github/pages-gem (github-pages)</summary>

### [`v232`](https://togithub.com/github/pages-gem/releases/tag/v232)

[Compare
Source](https://togithub.com/github/pages-gem/compare/v231...v232)

#### What's Changed

- Bump docker/build-push-action from 5 to 6 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/github/pages-gem/pull/916](https://togithub.com/github/pages-gem/pull/916)
- Fix obscured gemfile issue by
[@&#8203;mrmanc](https://togithub.com/mrmanc) in
[https://github.com/github/pages-gem/pull/912](https://togithub.com/github/pages-gem/pull/912)
- Add webrick as Ruby 3 doesn’t include it by
[@&#8203;mrmanc](https://togithub.com/mrmanc) in
[https://github.com/github/pages-gem/pull/914](https://togithub.com/github/pages-gem/pull/914)
- Update nokogiri CVE-2024-25062 by
[@&#8203;naxhh](https://togithub.com/naxhh) in
[https://github.com/github/pages-gem/pull/911](https://togithub.com/github/pages-gem/pull/911)
- Parkr jekyll3.10 by
[@&#8203;yoannchaudet](https://togithub.com/yoannchaudet) in
[https://github.com/github/pages-gem/pull/919](https://togithub.com/github/pages-gem/pull/919)
- Fix improperly bound regex by
[@&#8203;yoannchaudet](https://togithub.com/yoannchaudet) in
[https://github.com/github/pages-gem/pull/921](https://togithub.com/github/pages-gem/pull/921)
- Prep 232 by [@&#8203;yoannchaudet](https://togithub.com/yoannchaudet)
in
[https://github.com/github/pages-gem/pull/923](https://togithub.com/github/pages-gem/pull/923)

#### New Contributors

- [@&#8203;naxhh](https://togithub.com/naxhh) made their first
contribution in
[https://github.com/github/pages-gem/pull/911](https://togithub.com/github/pages-gem/pull/911)

**Full Changelog**:
github/pages-gem@v231...v232

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "every weekend" (UTC), Automerge - At
any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View the
[repository job
log](https://developer.mend.io/github/slsa-framework/slsa).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

---------

Signed-off-by: Mend Renovate <[email protected]>
Signed-off-by: Arnaud J Le Hors <[email protected]>
Co-authored-by: Arnaud J Le Hors <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Running with docker image does not work out-of-the-box
3 participants