Compare commits
3 Commits
43462ba5ae
...
8705b95127
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8705b95127
|
||
|
|
a34a82e3f5
|
||
|
|
f95fb5611a
|
@@ -121,7 +121,7 @@ spec:
|
||||
- name: url
|
||||
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
||||
- name: revision
|
||||
value: 740029f9557b586e1807586ebad58d6cd57ddae5
|
||||
value: 7d4b33528fef5f2e662d32d093566ce56eb4acd0
|
||||
- name: pathInRepo
|
||||
value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
|
||||
params:
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
# Builder
|
||||
#
|
||||
|
||||
FROM scratch AS private
|
||||
ADD git@code.fizz.buzz:talexander/homepage_private.git /homepage_private
|
||||
|
||||
FROM nixos/nix:2.31.3 AS builder
|
||||
|
||||
RUN tee -a /etc/nix/nix.conf <<EOF
|
||||
@@ -41,6 +44,9 @@ COPY --from=builder /tmp/ca-bundle.crt /etc/ssl/certs/ca-bundle.crt
|
||||
COPY --from=builder /tmp/nix-store-closure /nix/store
|
||||
COPY --from=builder /tmp/build/result /app
|
||||
COPY --from=builder /tmp/sh /bin/sh
|
||||
|
||||
COPY --link --from=private /homepage_private/static /foo
|
||||
|
||||
EXPOSE 8080
|
||||
#RUN addgroup web && adduser -D -G web web
|
||||
#&& install -d -D -o web -g web -m 700 /srv/http/public
|
||||
|
||||
@@ -84,18 +84,12 @@
|
||||
homepage = final.lib.makeScope final.newScope (
|
||||
homepageScope:
|
||||
let
|
||||
homepage_private = fetchGit {
|
||||
url = "git@code.fizz.buzz:talexander/homepage_private.git";
|
||||
ref = "main";
|
||||
rev = "89ba9628bf3e596345bc83f59cef5a2943584894";
|
||||
};
|
||||
natter' = (natter.overlays.default final final).natter.release;
|
||||
organic_ast_explorer' =
|
||||
(organic_ast_explorer.overlays.default final final).organic_ast_explorer.release;
|
||||
release = homepageScope.callPackage ./nix/package.nix {
|
||||
natter = natter';
|
||||
organic_ast_explorer = organic_ast_explorer';
|
||||
inherit homepage_private;
|
||||
};
|
||||
nginx_conf = final.replaceVars "${./docker/server/nginx.conf}" {
|
||||
web_root = release;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
hello,
|
||||
lib,
|
||||
pkgs,
|
||||
natter,
|
||||
organic_ast_explorer,
|
||||
homepage_private,
|
||||
}:
|
||||
let
|
||||
|
||||
@@ -14,12 +14,19 @@ pkgs.stdenv.mkDerivation rec {
|
||||
|
||||
src = lib.cleanSource ../.;
|
||||
|
||||
nativeBuildInputs = [
|
||||
# pkgs.simgrid
|
||||
# pkgs.boost
|
||||
# pkgs.cmake
|
||||
];
|
||||
|
||||
configurePhase = "";
|
||||
|
||||
# TODO copy COPY --link --from=private /homepage_private/static /source/static/
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p static/organic/ast_explorer
|
||||
cp ${organic_ast_explorer}/* static/organic/ast_explorer/
|
||||
cp -r ${homepage_private}/static/* static/
|
||||
|
||||
${natter}/bin/natter build --config natter.toml
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user