ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

remove nextcloud-image, add haproxy to build

Browse Source 
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
ahuston-0 2024-08-17 21:51:05 -04:00
parent b18438924b
commit 269a9833c4
No known key found for this signature in database
GPG Key ID: 1FACF4075E3212F7
4 changed files with 1 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
systems/palatine-hill/docker/default.nix
View File

@ -12,6 +12,7 @@
./firefly.nix
./foundry.nix
./glances.nix
./haproxy.nix
./minecraft.nix
./nextcloud.nix
./postgres.nix

89
systems/palatine-hill/docker/nextcloud-image/default.nix
View File

@ -1,89 +0,0 @@
{ pkgs, ... }:
let
nextcloud-apache = pkgs.dockerTools.pullImage (import ./nextcloud-apache.nix);
in
pkgs.dockerTools.buildImage {
name = "nextcloud-custom";
tag = "latest";
fromImage = nextcloud-apache;
diskSize = 8192;
buildVMMemorySize = 8192;
compressor = "zstd";
# contents = ./.;
# copyToRoot = pkgs.buildEnv {
# name="supervisord";
# paths = [./.];
# pathsToLink = [ "./supervisord.conf" ];
# };
useFUSEOverlayFS = true;
# enableFakechroot = true;
runAsRoot = ''
set -ex; \
\
/usr/bin/apt-get update; \
/usr/bin/apt-get install -y --no-install-recommends \
ffmpeg \
ghostscript \
libmagickcore-6.q16-6-extra \
procps \
smbclient \
supervisor \
# libreoffice \
; \
rm -rf /var/lib/apt/lists/*
set -ex; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
/usr/bin/apt-get update; \
/usr/bin/apt-get install -y --no-install-recommends \
libbz2-dev \
libc-client-dev \
libkrb5-dev \
libsmbclient-dev \
; \
\
/usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
/usr/local/bin/docker-php-ext-install \
bz2 \
imap \
; \
/usr/local/bin/pecl install smbclient; \
/usr/local/bin/docker-php-ext-enable smbclient; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
/usr/bin/apt-mark auto '.*' > /dev/null; \
/usr/bin/apt-mark manual $savedAptMark; \
/usr/bin/ldd "$(/usr/local/bin/php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
\
/usr/bin/apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*
mkdir -p \
/var/log/supervisord \
/var/run/supervisord \
;
'';
config = {
ENV = {
NEXTCLOUD_UPDATE = 1;
};
CMD = [
"/usr/bin/supervisord"
"-c"
# ./supervisord.conf
];
};
}
# build: nextcloud-dockerfiles/full/apache/

7
systems/palatine-hill/docker/nextcloud-image/nextcloud-apache.nix
View File

@ -1,7 +0,0 @@
{
imageName = "nextcloud";
imageDigest = "sha256:fe7f941cc514fe01e343a515c7b33e6b12707c718157f6e25a67119e9918a061";
sha256 = "07w9rvmr2qy037ljdmk6w1n2dmwwa31ig7gzfb084wiv18hjfrg4";
finalImageName = "nextcloud";
finalImageTag = "apache";
}

22
systems/palatine-hill/docker/nextcloud-image/supervisord.conf
View File

@ -1,22 +0,0 @@
[supervisord]
nodaemon=true
logfile=/var/log/supervisord/supervisord.log
pidfile=/var/run/supervisord/supervisord.pid
childlogdir=/var/log/supervisord/
logfile_maxbytes=50MB ; maximum size of logfile before rotation
logfile_backups=10 ; number of backed up logfiles
loglevel=error
[program:apache2]
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=apache2-foreground
[program:cron]
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=/cron.sh