-
Notifications
You must be signed in to change notification settings - Fork 709
[contrib] add docker-compose.yml #15972
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
Merged
+53
−19
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,27 @@ | ||
| .PHONY: deps build server clean | ||
|
|
||
| # Copy dependencies from node_modules to assets | ||
| deps: | ||
| ./utilities/build-scripts/copy-scss-deps.sh | ||
| ./utilities/build-scripts/copy-js-deps.sh | ||
|
|
||
| # Build the site | ||
| build: deps | ||
| hugo | ||
|
|
||
| # Run the development server | ||
| server: deps | ||
| hugo server | ||
|
|
||
| # Clean up generated files | ||
| clean: | ||
| rm -rf public/ | ||
| rm -rf resources/ | ||
| .PHONY: deps build server clean docker-server | ||
|
|
||
| HUGO_VERSION := $(shell grep 'HUGO_VERSION:' .github/workflows/hugo.yml | sed 's/.*: //') | ||
| NODE_VERSION := $(shell grep 'NODE_VERSION:' .github/workflows/hugo.yml | sed 's/.*: //') | ||
|
|
||
| # Copy dependencies from node_modules to assets | ||
| deps: | ||
| ./utilities/build-scripts/copy-scss-deps.sh | ||
| ./utilities/build-scripts/copy-js-deps.sh | ||
|
|
||
| # Build the site | ||
| build: deps | ||
| hugo | ||
|
|
||
| # Run the development server | ||
| server: deps | ||
| hugo server | ||
|
|
||
| # Run the development server via Docker (versions sourced from .github/workflows/hugo.yml) | ||
| docker-server: | ||
| NODE_VERSION=$(NODE_VERSION) HUGO_VERSION=$(HUGO_VERSION) \ | ||
| docker compose -f utilities/contrib/docker-compose.yml up | ||
|
|
||
| # Clean up generated files | ||
| clean: | ||
| rm -rf public/ | ||
| rm -rf resources/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # docker compose -f utilities/contrib/docker-compose.yml up | ||
| services: | ||
| hugo: | ||
| build: | ||
| dockerfile: ../../.devcontainer/Dockerfile | ||
| args: | ||
| NODE_VERSION: "${NODE_VERSION:?NODE_VERSION must be set - run via make docker-server}" | ||
| VARIANT: hugo_extended | ||
| VERSION: "${HUGO_VERSION:?HUGO_VERSION must be set - run via make docker-server}" | ||
| working_dir: /workspace | ||
| volumes: | ||
| - ../../:/workspace | ||
| - node_modules:/workspace/node_modules | ||
| ports: | ||
| - "1313:1313" | ||
| command: sh -c "npm install && make deps && hugo server --bind 0.0.0.0 --poll 1s" | ||
|
|
||
| volumes: | ||
| node_modules: |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also stripped the Windows-style line endings from this file, which is why every line has been modified.