refactor utils, nextcloud image, add fetch-docker script
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
parent
bff8bcd72c
commit
839278ef88
@ -1,12 +1,6 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let
|
||||||
nextcloud-apache = pkgs.dockerTools.pullImage {
|
nextcloud-apache = pkgs.dockerTools.pullImage (import ./nextcloud-apache.nix);
|
||||||
imageName = "nextcloud";
|
|
||||||
imageDigest = "sha256:2ab0c5de2afd33c55721e69e87bd1667cad6c4550ba0fd0303cfeb7abb260750";
|
|
||||||
sha256 = "11fh4jaz1asiihf2092sh7ma9xm35hmnkafpbjr3igkv8jicsky1";
|
|
||||||
finalImageName = "nextcloud";
|
|
||||||
finalImageTag = "apache";
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
|
|
||||||
pkgs.dockerTools.buildImage {
|
pkgs.dockerTools.buildImage {
|
@ -6,7 +6,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
nextcloud-image = import ./nextcloud-image.nix { inherit pkgs; };
|
nextcloud-image = import ./nextcloud-image { inherit pkgs; };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
virtualisation.oci-containers.containers = {
|
virtualisation.oci-containers.containers = {
|
||||||
|
@ -14,9 +14,7 @@ parent_path=$(dirname "$script_path")
|
|||||||
# relpath is the relative path to the parent_path where you want the file written
|
# relpath is the relative path to the parent_path where you want the file written
|
||||||
# format: <image name>,<image tag>,<image architecture>,<os>,<relpath>
|
# format: <image name>,<image tag>,<image architecture>,<os>,<relpath>
|
||||||
images=(
|
images=(
|
||||||
# commented out until palatine-hill docker changes are live
|
|
||||||
"nextcloud,apache,amd64,linux,/systems/palatine-hill/docker/nextcloud-image/nextcloud-apache.nix"
|
"nextcloud,apache,amd64,linux,/systems/palatine-hill/docker/nextcloud-image/nextcloud-apache.nix"
|
||||||
|
|
||||||
)
|
)
|
||||||
IFS=","
|
IFS=","
|
||||||
while read -r name tag arch os relpath; do
|
while read -r name tag arch os relpath; do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user