Skip to content

Support servers.json in a conf.d directory#432

Merged
acelaya merged 3 commits into
shlinkio:developfrom
matiasgarciaisaia:feature/conf-volume
May 29, 2021
Merged

Support servers.json in a conf.d directory#432
acelaya merged 3 commits into
shlinkio:developfrom
matiasgarciaisaia:feature/conf-volume

Conversation

@matiasgarciaisaia

Copy link
Copy Markdown
Contributor

In Cattle (and maybe other Docker environments) you can't mount specific files, but have to mount a whole volume as a directory.

This PR allows the servers.json to be looked for inside a specific folder to support that use case.

Instead of running:

docker run --rm -v ${PWD}/misc/servers.json:/usr/share/nginx/html/servers.json -ti shlinkio/shlink-web-client

This PR allows to run:

docker run --rm -v ${PWD}/misc/:/usr/share/nginx/html/conf.d/ -ti shlinkio/shlink-web-client

With the same results.

The conf.d may become handy for other configuration files in the future (if there are any other ones).

@github-actions

Copy link
Copy Markdown

@codecov-commenter

codecov-commenter commented May 29, 2021

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (develop@24801b0). Learn more about missing BASE report.

Additional details and impacted files
@@            Coverage Diff             @@
##             develop     #432   +/-   ##
==========================================
  Coverage           ?   75.62%           
==========================================
  Files              ?      142           
  Lines              ?     1670           
  Branches           ?      242           
==========================================
  Hits               ?     1263           
  Misses             ?      213           
  Partials           ?      194           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

matiasgarciaisaia and others added 2 commits May 29, 2021 11:41
In Cattle (and maybe other Docker environments) you can't mount specific files, but
have to mount a whole volume as a directory.

We now allow the servers.json to be looked for inside a specific folder to support
that use case.
@acelaya acelaya force-pushed the feature/conf-volume branch from a0a64fc to bbc3342 Compare May 29, 2021 09:53
@acelaya acelaya changed the base branch from main to develop May 29, 2021 09:53
@acelaya

acelaya commented May 29, 2021

Copy link
Copy Markdown
Member

Thanks!

@acelaya acelaya added this to the 3.2.0 milestone May 29, 2021
@acelaya acelaya merged commit e0c20c7 into shlinkio:develop May 29, 2021
matiasgarciaisaia added a commit to matiasgarciaisaia/shlink-web-client that referenced this pull request May 29, 2021
Alfar0nt pushed a commit to Alfar0nt/dhiarlink-web-client that referenced this pull request Jun 15, 2026
…olume

Support servers.json in a conf.d directory
Alfar0nt pushed a commit to Alfar0nt/dhiarlink-web-client that referenced this pull request Jun 15, 2026
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.

3 participants