-
Notifications
You must be signed in to change notification settings - Fork 24
Feature/nixified build #132
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
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
63cc9b6
Introduced a Nix Flake -based pipeline for building the blog
Ocramius 39ab8a4
Added Renovate setup configuration, based off same renovate structure…
Ocramius 9b8eff6
Added basic CI pipeline flow, flake checks
Ocramius 7e7a4df
Corrected minor case sensitivity issue leading to Caddy filesystem co…
Ocramius 6c98066
Included build steps to run the entire blog off a docker container wi…
Ocramius f030638
Disable caddy admin UI - dangerous
Ocramius 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| name: "Continuous Integration" | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
|
|
||
| jobs: | ||
| check-blog-build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v6 | ||
|
|
||
| - uses: cachix/install-nix-action@v31 | ||
|
|
||
| - run: nix flake check -L | ||
|
|
||
| - name: "Verify that we can update PHP dependencies from composer.lock" | ||
| run: nix run .#update-php-packages |
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,4 +1,5 @@ | ||
| /.sculpin/ | ||
| /result/ | ||
| /app/cache/* | ||
| /app/config/sculpin_kernel_*.yml | ||
| /app/config/sculpin_site_*.yml | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ./caddy-embed |
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,18 @@ | ||
| { | ||
| email ocramius@gmail.com | ||
|
|
||
| admin off | ||
| http_port 8080 | ||
|
|
||
| # log access_logs { | ||
| # level DEBUG | ||
| # } | ||
|
Comment on lines
+7
to
+9
Owner
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unsure about the logging level I want
Owner
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Will leave this as-is, for now: self-hosting is to be done sometime this year, but the container is ready 👍 |
||
|
|
||
| filesystem my_embeds embedded | ||
| } | ||
|
|
||
| *:8080 { | ||
| file_server { | ||
| fs my_embeds | ||
| } | ||
| } | ||
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,21 @@ | ||
| MIT License | ||
|
|
||
| Copyright (c) 2022 Matthew Holt | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| SOFTWARE. |
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,10 @@ | ||
| Caddy embedded file system | ||
| =========================== | ||
|
|
||
| This comes from https://github.com/mholt/caddy-embed/blob/a3908443d8bf78c61d0799f5e8854cf05db698b9/README.md | ||
|
|
||
| This subproject is mirrored here so that `go.mod` and `go.sum` can be correctly and automatically upgraded | ||
| by Renovate, to keep dependencies in check. | ||
|
|
||
| Also, this does not use `xcaddy`, as suggested in upstream: it instead just ships `main.go`, which loads | ||
| caddy. |
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,28 @@ | ||
| <html> | ||
| <body> | ||
| <h1>Caddy embedded file server works!</h1> | ||
| <p> | ||
| <b>Make sure to replace the contents of this folder with your own files.</b> | ||
| </p> | ||
| <p> | ||
| You will need to clone this Caddy plugin and replace the files in the <code>files</code> | ||
| subfolder, then build Caddy with your locally-cloned plugin to embed your own content. | ||
| Something like this: | ||
| </p> | ||
| <pre><code>$ git clone https://github.com/mholt/caddy-embed.git | ||
| $ cd caddy-embed | ||
| $ rm files/* | ||
| $ cp -r ~/site files/ | ||
| $ xcaddy build --with github.com/mholt/caddy-embed=.</code></pre> | ||
| <p> | ||
| Then your <code>caddy</code> binary has your site's files embedded with in it. | ||
| Be sure to specify it in your config: | ||
| </p> | ||
| <pre><code>file_server { | ||
| fs embedded | ||
| }</code></pre> | ||
| <p> | ||
| <a href="https://github.com/mholt/caddy-embed">Source code and issues on GitHub</a> | ||
| </p> | ||
| </body> | ||
| </html> |
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,155 @@ | ||
| module github.com/mholt/caddy-embed | ||
|
|
||
| go 1.26 | ||
|
|
||
| require github.com/caddyserver/caddy/v2 v2.10.2 | ||
|
|
||
| require ( | ||
| cel.dev/expr v0.24.0 // indirect | ||
| cloud.google.com/go/auth v0.16.2 // indirect | ||
| cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect | ||
| cloud.google.com/go/compute/metadata v0.7.0 // indirect | ||
| dario.cat/mergo v1.0.1 // indirect | ||
| filippo.io/edwards25519 v1.1.0 // indirect | ||
| github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect | ||
| github.com/BurntSushi/toml v1.5.0 // indirect | ||
| github.com/KimMachineGun/automemlimit v0.7.4 // indirect | ||
| github.com/Masterminds/goutils v1.1.1 // indirect | ||
| github.com/Masterminds/semver/v3 v3.3.0 // indirect | ||
| github.com/Masterminds/sprig/v3 v3.3.0 // indirect | ||
| github.com/Microsoft/go-winio v0.6.0 // indirect | ||
| github.com/alecthomas/chroma/v2 v2.20.0 // indirect | ||
| github.com/antlr4-go/antlr/v4 v4.13.0 // indirect | ||
| github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect | ||
| github.com/beorn7/perks v1.0.1 // indirect | ||
| github.com/caddyserver/certmagic v0.24.0 // indirect | ||
| github.com/caddyserver/zerossl v0.1.3 // indirect | ||
| github.com/ccoveille/go-safecast v1.6.1 // indirect | ||
| github.com/cenkalti/backoff/v5 v5.0.2 // indirect | ||
| github.com/cespare/xxhash v1.1.0 // indirect | ||
| github.com/cespare/xxhash/v2 v2.3.0 // indirect | ||
| github.com/chzyer/readline v1.5.1 // indirect | ||
| github.com/cloudflare/circl v1.6.1 // indirect | ||
| github.com/coreos/go-oidc/v3 v3.14.1 // indirect | ||
| github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect | ||
| github.com/dgraph-io/badger v1.6.2 // indirect | ||
| github.com/dgraph-io/badger/v2 v2.2007.4 // indirect | ||
| github.com/dgraph-io/ristretto v0.2.0 // indirect | ||
| github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect | ||
| github.com/dlclark/regexp2 v1.11.5 // indirect | ||
| github.com/dustin/go-humanize v1.0.1 // indirect | ||
| github.com/felixge/httpsnoop v1.0.4 // indirect | ||
| github.com/francoispqt/gojay v1.2.13 // indirect | ||
| github.com/fxamacker/cbor/v2 v2.8.0 // indirect | ||
| github.com/go-chi/chi/v5 v5.2.2 // indirect | ||
| github.com/go-jose/go-jose/v3 v3.0.4 // indirect | ||
| github.com/go-jose/go-jose/v4 v4.0.5 // indirect | ||
| github.com/go-logr/logr v1.4.3 // indirect | ||
| github.com/go-logr/stdr v1.2.2 // indirect | ||
| github.com/go-sql-driver/mysql v1.8.1 // indirect | ||
| github.com/golang/protobuf v1.5.4 // indirect | ||
| github.com/golang/snappy v0.0.4 // indirect | ||
| github.com/google/cel-go v0.26.0 // indirect | ||
| github.com/google/certificate-transparency-go v1.1.8-0.20240110162603-74a5dd331745 // indirect | ||
| github.com/google/go-tpm v0.9.5 // indirect | ||
| github.com/google/go-tspi v0.3.0 // indirect | ||
| github.com/google/s2a-go v0.1.9 // indirect | ||
| github.com/google/uuid v1.6.0 // indirect | ||
| github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect | ||
| github.com/googleapis/gax-go/v2 v2.14.2 // indirect | ||
| github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect | ||
| github.com/huandu/xstrings v1.5.0 // indirect | ||
| github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||
| github.com/jackc/pgpassfile v1.0.0 // indirect | ||
| github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect | ||
| github.com/jackc/pgx/v5 v5.6.0 // indirect | ||
| github.com/jackc/puddle/v2 v2.2.1 // indirect | ||
| github.com/klauspost/compress v1.18.0 // indirect | ||
| github.com/klauspost/cpuid/v2 v2.3.0 // indirect | ||
| github.com/libdns/libdns v1.1.0 // indirect | ||
| github.com/manifoldco/promptui v0.9.0 // indirect | ||
| github.com/mattn/go-colorable v0.1.13 // indirect | ||
| github.com/mattn/go-isatty v0.0.20 // indirect | ||
| github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect | ||
| github.com/mholt/acmez/v3 v3.1.2 // indirect | ||
| github.com/miekg/dns v1.1.63 // indirect | ||
| github.com/mitchellh/copystructure v1.2.0 // indirect | ||
| github.com/mitchellh/go-ps v1.0.0 // indirect | ||
| github.com/mitchellh/reflectwalk v1.0.2 // indirect | ||
| github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | ||
| github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect | ||
| github.com/pires/go-proxyproto v0.8.1 // indirect | ||
| github.com/pkg/errors v0.9.1 // indirect | ||
| github.com/prometheus/client_golang v1.23.0 // indirect | ||
| github.com/prometheus/client_model v0.6.2 // indirect | ||
| github.com/prometheus/common v0.65.0 // indirect | ||
| github.com/prometheus/procfs v0.16.1 // indirect | ||
| github.com/quic-go/qpack v0.5.1 // indirect | ||
| github.com/quic-go/quic-go v0.54.0 // indirect | ||
| github.com/rs/xid v1.6.0 // indirect | ||
| github.com/russross/blackfriday/v2 v2.1.0 // indirect | ||
| github.com/shopspring/decimal v1.4.0 // indirect | ||
| github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect | ||
| github.com/sirupsen/logrus v1.9.3 // indirect | ||
| github.com/slackhq/nebula v1.9.5 // indirect | ||
| github.com/smallstep/certificates v0.28.4 // indirect | ||
| github.com/smallstep/cli-utils v0.12.1 // indirect | ||
| github.com/smallstep/go-attestation v0.4.4-0.20241119153605-2306d5b464ca // indirect | ||
| github.com/smallstep/linkedca v0.23.0 // indirect | ||
| github.com/smallstep/nosql v0.7.0 // indirect | ||
| github.com/smallstep/pkcs7 v0.2.1 // indirect | ||
| github.com/smallstep/scep v0.0.0-20240926084937-8cf1ca453101 // indirect | ||
| github.com/smallstep/truststore v0.13.0 // indirect | ||
| github.com/spf13/cast v1.7.0 // indirect | ||
| github.com/spf13/cobra v1.9.1 // indirect | ||
| github.com/spf13/pflag v1.0.7 // indirect | ||
| github.com/stoewer/go-strcase v1.2.0 // indirect | ||
| github.com/tailscale/tscert v0.0.0-20240608151842-d3f834017e53 // indirect | ||
| github.com/urfave/cli v1.22.17 // indirect | ||
| github.com/x448/float16 v0.8.4 // indirect | ||
| github.com/yuin/goldmark v1.7.13 // indirect | ||
| github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc // indirect | ||
| github.com/zeebo/blake3 v0.2.4 // indirect | ||
| go.etcd.io/bbolt v1.3.10 // indirect | ||
| go.opentelemetry.io/auto/sdk v1.1.0 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect | ||
| go.opentelemetry.io/contrib/propagators/autoprop v0.62.0 // indirect | ||
| go.opentelemetry.io/contrib/propagators/aws v1.37.0 // indirect | ||
| go.opentelemetry.io/contrib/propagators/b3 v1.37.0 // indirect | ||
| go.opentelemetry.io/contrib/propagators/jaeger v1.37.0 // indirect | ||
| go.opentelemetry.io/contrib/propagators/ot v1.37.0 // indirect | ||
| go.opentelemetry.io/otel v1.37.0 // indirect | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect | ||
| go.opentelemetry.io/otel/metric v1.37.0 // indirect | ||
| go.opentelemetry.io/otel/sdk v1.37.0 // indirect | ||
| go.opentelemetry.io/otel/trace v1.37.0 // indirect | ||
| go.opentelemetry.io/proto/otlp v1.7.0 // indirect | ||
| go.step.sm/crypto v0.67.0 // indirect | ||
| go.uber.org/automaxprocs v1.6.0 // indirect | ||
| go.uber.org/mock v0.5.2 // indirect | ||
| go.uber.org/multierr v1.11.0 // indirect | ||
| go.uber.org/zap v1.27.0 // indirect | ||
| go.uber.org/zap/exp v0.3.0 // indirect | ||
| golang.org/x/crypto v0.40.0 // indirect | ||
| golang.org/x/crypto/x509roots/fallback v0.0.0-20250305170421-49bf5b80c810 // indirect | ||
| golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect | ||
| golang.org/x/mod v0.25.0 // indirect | ||
| golang.org/x/net v0.42.0 // indirect | ||
| golang.org/x/oauth2 v0.30.0 // indirect | ||
| golang.org/x/sync v0.16.0 // indirect | ||
| golang.org/x/sys v0.34.0 // indirect | ||
| golang.org/x/term v0.33.0 // indirect | ||
| golang.org/x/text v0.27.0 // indirect | ||
| golang.org/x/time v0.12.0 // indirect | ||
| golang.org/x/tools v0.34.0 // indirect | ||
| google.golang.org/api v0.240.0 // indirect | ||
| google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect | ||
| google.golang.org/grpc v1.73.0 // indirect | ||
| google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect | ||
| google.golang.org/protobuf v1.36.6 // indirect | ||
| gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| howett.net/plist v1.0.0 // indirect | ||
| ) |
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.
Uh oh!
There was an error while loading. Please reload this page.