Use podman for t3 docs rendering but docker-compose everywhere else
podman-compose has some issues on ubuntu and with volumes. I'll keep docker-compose. But I prefer podman for t3docs rendering as it doesn't fuck up the file permissions.
This commit is contained in:
parent
664d9338d6
commit
a3ebd243a8
|
@ -40,6 +40,8 @@ with pkgs; [
|
||||||
kcachegrind
|
kcachegrind
|
||||||
geckodriver
|
geckodriver
|
||||||
|
|
||||||
|
docker-compose
|
||||||
|
|
||||||
# In order to pull binaries from their.
|
# In order to pull binaries from their.
|
||||||
# E.g. phps: https://github.com/fossar/nix-phps#how-to-use
|
# E.g. phps: https://github.com/fossar/nix-phps#how-to-use
|
||||||
cachix
|
cachix
|
||||||
|
@ -76,9 +78,6 @@ with pkgs; [
|
||||||
|
|
||||||
gtkpod
|
gtkpod
|
||||||
|
|
||||||
podman
|
|
||||||
podman-compose
|
|
||||||
|
|
||||||
] else [
|
] else [
|
||||||
# hikari 2
|
# hikari 2
|
||||||
|
|
||||||
|
|
|
@ -8,9 +8,7 @@
|
||||||
(callPackage ./update-system { })
|
(callPackage ./update-system { })
|
||||||
(callPackage ./nextcloud-sync/from-local.nix { })
|
(callPackage ./nextcloud-sync/from-local.nix { })
|
||||||
(callPackage ./nextcloud-sync/from-remote.nix { })
|
(callPackage ./nextcloud-sync/from-remote.nix { })
|
||||||
(callPackage ./typo3-documentation-rendering {
|
(callPackage ./typo3-documentation-rendering { })
|
||||||
inherit ownLib;
|
|
||||||
})
|
|
||||||
(callPackage ./build-phpactor { })
|
(callPackage ./build-phpactor { })
|
||||||
(callPackage ./project {
|
(callPackage ./project {
|
||||||
inherit ownLib;
|
inherit ownLib;
|
||||||
|
|
|
@ -1,28 +1,23 @@
|
||||||
{
|
{
|
||||||
writeShellApplication,
|
writeShellApplication,
|
||||||
ownLib,
|
|
||||||
podman
|
podman
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
writeShellApplication {
|
||||||
usePodman = ownLib.onHikari {};
|
|
||||||
runner = if usePodman then "podman" else "docker";
|
|
||||||
image = (if usePodman then "docker.io/" else "") + "t3docs/render-documentation:latest";
|
|
||||||
runtimeInputs = if usePodman then [ podman ] else [ ];
|
|
||||||
|
|
||||||
in writeShellApplication {
|
|
||||||
name = "custom-typo3-render-documentation";
|
name = "custom-typo3-render-documentation";
|
||||||
|
|
||||||
inherit runtimeInputs;
|
runtimeInputs = [
|
||||||
|
podman
|
||||||
|
];
|
||||||
|
|
||||||
# See: https://t3docs.github.io/DRC-The-Docker-Rendering-Container/07-To-be-sorted/quickstart.html#build-html-with-plain-docker-commands
|
# See: https://t3docs.github.io/DRC-The-Docker-Rendering-Container/07-To-be-sorted/quickstart.html#build-html-with-plain-docker-commands
|
||||||
text = ''
|
text = ''
|
||||||
mkdir -p Documentation-GENERATED-temp
|
mkdir -p Documentation-GENERATED-temp
|
||||||
${runner} \
|
podman \
|
||||||
run --rm \
|
run --rm \
|
||||||
-v "$(pwd)":/PROJECT:ro \
|
-v "$(pwd)":/PROJECT:ro \
|
||||||
-v "$(pwd)/Documentation-GENERATED-temp":/RESULT \
|
-v "$(pwd)/Documentation-GENERATED-temp":/RESULT \
|
||||||
${image} \
|
docker.io/t3docs/render-documentation:latest \
|
||||||
makehtml
|
makehtml
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,4 +32,4 @@ See: https://github.com/NixOS/nixos-hardware
|
||||||
TODOs
|
TODOs
|
||||||
-----
|
-----
|
||||||
|
|
||||||
* Add docker-compose / podman-compose for Elasticsearch, proxy, solr.
|
* Add docker-compose for Elasticsearch, proxy, solr.
|
||||||
|
|
Loading…
Reference in a new issue