diff options
| -rw-r--r-- | Caddyfile | 14 | ||||
| -rw-r--r-- | Dockerfile | 7 | ||||
| -rw-r--r-- | config.toml | 2 | ||||
| -rw-r--r-- | flake.nix | 80 | ||||
| -rw-r--r-- | fly.toml | 1 | ||||
| -rwxr-xr-x | scripts/deploy.sh | 14 |
6 files changed, 68 insertions, 50 deletions
diff --git a/Caddyfile b/Caddyfile new file mode 100644 index 0000000..7456ef5 --- /dev/null +++ b/Caddyfile @@ -0,0 +1,14 @@ +{ + http_port 8080 + auto_https off +} + +http://fcunynet.fly.dev { + redir https://fcuny.net +} + +http://fcuny.net { + root * {$SITE_ROOT} + encode gzip + file_server +} diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 64c0f97..0000000 --- a/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM klakegg/hugo:0.91.2-ext-alpine-onbuild AS hugo - -FROM pierrezemb/gostatic - -COPY --from=hugo /target /srv/http/ - -CMD ["-port", "8080" , "-https-promote"] diff --git a/config.toml b/config.toml index 8cb0c62..ace03c8 100644 --- a/config.toml +++ b/config.toml @@ -2,7 +2,7 @@ baseURL = "https://fcuny.net/" languageCode = "en-us" title = "Franck's rambling" publishDir = "docs" -enableGitInfo = true +enableGitInfo = false [params] homeText = "A collection of posts" @@ -8,39 +8,63 @@ outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: - let pkgs = nixpkgs.legacyPackages.${system}; - in { - defaultPackage = with pkgs; - stdenv.mkDerivation { - pname = "fcuny.net"; - version = self.lastModifiedDate; - src = ./.; - buildInputs = [ hugo git ]; - buildPhase = '' - mkdir -p $out - hugo --minify --destination $out - ''; - dontInstall = true; + let + pkgs = nixpkgs.legacyPackages.${system}; + caddyfile = ./Caddyfile; + in + { + packages = { + site = with pkgs; + stdenv.mkDerivation { + pname = "fcuny.net"; + version = self.lastModifiedDate; + src = ./.; + buildInputs = [ hugo git ]; + buildPhase = '' + mkdir -p $out + hugo --minify --destination $out + ''; + dontInstall = true; + }; + container = pkgs.dockerTools.buildLayeredImage { + name = self.packages."${system}".site.pname; + tag = self.packages."${system}".site.version; + config = { + Cmd = [ "${pkgs.caddy}/bin/caddy" "run" "--adapter" "caddyfile" "--config" "${caddyfile}" ]; + Env = [ + "SITE_ROOT=${self.packages."${system}".site}" + ]; + }; }; - - defaultApp = pkgs.writers.writeBashBin "run-hugo" '' - set -e - set -o pipefail - export PATH=${pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git ]} - hugo server -D - ''; - - apps = { - deploy = pkgs.pkgs.writeShellScriptBin "run-deploy" '' + deploy = pkgs.writeShellScriptBin "deploy" '' set -euxo pipefail - export PATH=${ - pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git pkgs.jq pkgs.flyctl ] - }:$PATH - bash ./scripts/deploy.sh + export PATH="${pkgs.lib.makeBinPath [(pkgs.docker.override { clientOnly = true; }) pkgs.flyctl]}:$PATH" + archive=${self.packages.x86_64-linux.container} + # load archive, drop all output except last line case of warnings), print image name + image=$(docker load < $archive | tail -n1 | awk '{ print $3; }') + flyctl deploy --image $image --local-only ''; + hugo = pkgs.writeShellScriptBin "hugo" '' + set -euo pipefail + export PATH=${pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git ]} + hugo server -D + ''; + }; + + apps = { + deploy = { + type = "app"; + program = "${self.packages."${system}".deploy}/bin/deploy"; + }; + default = { + type = "app"; + program = "${self.packages."${system}".hugo}/bin/hugo"; + }; }; + defaultPackage = self.packages."${system}".container; + devShell = - pkgs.mkShell { buildInputs = with pkgs; [ hugo flyctl git jq ]; }; + pkgs.mkShell { buildInputs = with pkgs; [ hugo flyctl git ]; }; }); } @@ -28,6 +28,7 @@ kill_timeout = 5 [[services.ports]] handlers = ["http"] port = 80 + force_https = true [[services.ports]] handlers = ["tls", "http"] diff --git a/scripts/deploy.sh b/scripts/deploy.sh deleted file mode 100755 index 69ad82a..0000000 --- a/scripts/deploy.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -git diff --exit-code -git diff --staged --exit-code - -flyctl deploy - -VERSION=$(flyctl info -j |jq -r '.App | "fcuny.net/v\(.Version)"') - -git tag -a --message ${VERSION} ${VERSION} -git push origin --all -git push origin --tags - -flyctl agent stop |