Skip to content

Commit

Permalink
Repo-sync
Browse files Browse the repository at this point in the history
  • Loading branch information
GitHub Workflow committed Feb 21, 2024
1 parent 40dd3d8 commit aacd537
Show file tree
Hide file tree
Showing 25 changed files with 73 additions and 17 deletions.
2 changes: 2 additions & 0 deletions Containers/apache/Caddyfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

https://{$ADDITIONAL_TRUSTED_DOMAIN}:443,
{$PROTOCOL}://{$NC_DOMAIN}:{$APACHE_PORT} {
header -Server
header -X-Powered-By

# Collabora
route /browser/* {
Expand Down
1 change: 1 addition & 0 deletions Containers/apache/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
FROM caddy:2.7.6-alpine as caddy

FROM httpd:2.4.58-alpine3.19
Expand Down
1 change: 1 addition & 0 deletions Containers/borgbackup/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
FROM alpine:3.19.1

RUN set -ex; \
Expand Down
3 changes: 2 additions & 1 deletion Containers/clamav/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# syntax=docker/dockerfile:latest
# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.1/alpine/Dockerfile
FROM clamav/clamav:1.2.1-30
FROM clamav/clamav:1.3.0-39

COPY clamav.conf /tmp/clamav.conf

Expand Down
3 changes: 2 additions & 1 deletion Containers/collabora/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# syntax=docker/dockerfile:latest
# From a file located probably somewhere here: https://github.com/CollaboraOnline/online/tree/master/docker
FROM collabora/code:23.05.8.4.1
FROM collabora/code:23.05.9.1.1

USER root

Expand Down
3 changes: 2 additions & 1 deletion Containers/docker-socket-proxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM haproxy:2.9.4-alpine3.19
# syntax=docker/dockerfile:latest
FROM haproxy:2.9.5-alpine3.19

# hadolint ignore=DL3002
USER root
Expand Down
1 change: 1 addition & 0 deletions Containers/domaincheck/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
FROM alpine:3.19.1
RUN set -ex; \
apk add --no-cache bash lighttpd netcat-openbsd; \
Expand Down
1 change: 1 addition & 0 deletions Containers/fulltextsearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
# Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
FROM elasticsearch:8.12.1

Expand Down
7 changes: 4 additions & 3 deletions Containers/imaginary/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM golang:1.22.0-alpine3.19 as go
# syntax=docker/dockerfile:latest
FROM golang:1.22.0-alpine3.18 as go

ENV IMAGINARY_HASH 6cd9edd1d3fb151eb773c14552886e4fc8e50138
ENV IMAGINARY_HASH 6cd9edd1d3fb151eb773c14552886e4fc8e50138

RUN set -ex; \
apk add --no-cache \
Expand All @@ -12,7 +13,7 @@ RUN set -ex; \
build-base; \
go install github.com/h2non/imaginary@"$IMAGINARY_HASH";

FROM alpine:3.19.1
FROM alpine:3.18.6
RUN set -ex; \
apk add --no-cache \
tzdata \
Expand Down
5 changes: 3 additions & 2 deletions Containers/mastercontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# syntax=docker/dockerfile:latest
# Docker CLI is a requirement
FROM docker:25.0.2-cli as docker
FROM docker:25.0.3-cli as docker

# Caddy is a requirement
FROM caddy:2.7.6-alpine as caddy

# From https://github.com/docker-library/php/blob/master/8.2/alpine3.19/fpm/Dockerfile
FROM php:8.2.15-fpm-alpine3.19
FROM php:8.2.16-fpm-alpine3.19

EXPOSE 80
EXPOSE 8080
Expand Down
1 change: 1 addition & 0 deletions Containers/nextcloud/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
FROM php:8.1.27-fpm-alpine3.19

ENV PHP_MEMORY_LIMIT 512M
Expand Down
2 changes: 1 addition & 1 deletion Containers/nextcloud/config/apps.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
'writable' => true,
),
),
'appsallowlist' => getenv('APPS_ALLOWLIST') ? explode(" ", getenv('APPS_ALLOWLIST')) : [],
'appsallowlist' => getenv('APPS_ALLOWLIST') ? explode(" ", getenv('APPS_ALLOWLIST')) : false,
);
1 change: 1 addition & 0 deletions Containers/notify-push/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
FROM alpine:3.19.1

COPY --chmod=775 start.sh /start.sh
Expand Down
1 change: 1 addition & 0 deletions Containers/onlyoffice/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
# From https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/Dockerfile
FROM onlyoffice/documentserver:7.5.1.1

Expand Down
3 changes: 2 additions & 1 deletion Containers/postgresql/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# syntax=docker/dockerfile:latest
# From https://github.com/docker-library/postgres/blob/master/15/alpine/Dockerfile
FROM postgres:15.5-alpine
FROM postgres:15.6-alpine

COPY --chmod=775 start.sh /start.sh
COPY --chmod=775 healthcheck.sh /healthcheck.sh
Expand Down
1 change: 1 addition & 0 deletions Containers/redis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
# From https://github.com/docker-library/redis/blob/master/7.0/alpine/Dockerfile
FROM redis:7.2.4-alpine

Expand Down
3 changes: 2 additions & 1 deletion Containers/talk-recording/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM python:3.12.1-alpine3.19
# syntax=docker/dockerfile:latest
FROM python:3.12.2-alpine3.19

COPY --chmod=775 start.sh /start.sh

Expand Down
3 changes: 2 additions & 1 deletion Containers/talk/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM nats:2.10.10-scratch as nats
# syntax=docker/dockerfile:latest
FROM nats:2.10.11-scratch as nats
FROM eturnal/eturnal:1.12.0 AS eturnal
FROM strukturag/nextcloud-spreed-signaling:1.2.3 as signaling
FROM alpine:3.19.1 as janus
Expand Down
1 change: 1 addition & 0 deletions Containers/watchtower/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
# From https://github.com/containrrr/watchtower/blob/main/dockerfiles/Dockerfile.self-contained
FROM containrrr/watchtower:1.7.1 as watchtower

Expand Down
2 changes: 1 addition & 1 deletion community-containers/pi-hole/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This container bundles pi-hole and auto-configures it for you.
- Make sure that no dns server is already running by checking with `sudo netstat -tulpn | grep 53`. Otherwise the container will not be able to start!
- The DHCP functionality of Pi-hole has been disabled!
- The data of pi-hole will be automatically included in AIOs backup solution!
- After adding and starting the container, you can visit `http://ip.address.of.this.server:8573` in order to log in with the admin key that you can retrieve when running `sudo docker inspect nextcloud-aio-pihole | grep WEBPASSWORD`. There you can configure the pi-hole setup. Also you can add local dns records.
- After adding and starting the container, you can visit `http://ip.address.of.this.server:8573/admin` in order to log in with the admin key that you can retrieve when running `sudo docker inspect nextcloud-aio-pihole | grep WEBPASSWORD`. There you can configure the pi-hole setup. Also you can add local dns records.
- You can configure your home network now to use pi-hole as its dns server by configuring your router.
- Additionally, you can configure the docker daemon to use that by editing `/etc/docker/daemon.json` and adding ` { "dns" : [ "ip.address.of.this.server" , "8.8.8.8" ] } `.
- See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack
Expand Down
2 changes: 1 addition & 1 deletion php/psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.21.1@8c473e2437be8b6a8fd8f630f0f11a16b114c494"/>
<files psalm-version="5.22.1@e9dad66e11274315dac27e08349c628c7d6a1a43"/>
9 changes: 9 additions & 0 deletions php/src/Controller/DockerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,15 @@ private function PerformRecursiveContainerStart(string $id, bool $pullImage = tr
}
}

// Check if docker hub is reachable in order to make sure that we do not try to pull an image if it is down
// and try to mitigate issues that are arising due to that
if ($pullImage) {
if (!$this->dockerActionManager->isDockerHubReachable($container)) {
$pullImage = false;
error_log('Not pulling the image for the ' . $container->GetContainerName() . ' container because docker hub does not seem to be reachable.');
}
}

$this->dockerActionManager->DeleteContainer($container);
$this->dockerActionManager->CreateVolumes($container);
if ($pullImage) {
Expand Down
23 changes: 21 additions & 2 deletions php/src/Docker/DockerActionManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,11 @@ public function GetLogs(string $id) : string

public function StartContainer(Container $container) : void {
$url = $this->BuildApiUrl(sprintf('containers/%s/start', urlencode($container->GetIdentifier())));
$this->guzzleClient->post($url);
try {
$this->guzzleClient->post($url);
} catch (RequestException $e) {
throw new \Exception("Could not start container " . $container->GetIdentifier() . ": " . $e->getMessage());
}
}

public function CreateVolumes(Container $container): void
Expand Down Expand Up @@ -578,9 +582,24 @@ public function CreateContainer(Container $container) : void {
]
);
} catch (RequestException $e) {
throw new \Exception("Could not start container " . $container->GetIdentifier() . ": " . $e->getMessage());
throw new \Exception("Could not create container " . $container->GetIdentifier() . ": " . $e->getMessage());
}

}

public function isDockerHubReachable(Container $container) : bool {
$tag = $container->GetImageTag();
if ($tag === '%AIO_CHANNEL%') {
$tag = $this->GetCurrentChannel();
}

$remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($container->GetContainerName(), $tag);

if ($remoteDigest === null) {
return false;
} else {
return true;
}
}

public function PullImage(Container $container) : void
Expand Down
2 changes: 1 addition & 1 deletion php/templates/containers.twig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</header>

<div class="content">
<h1>Nextcloud AIO v7.12.1</h1>
<h1>Nextcloud AIO v7.13.0</h1>

{# Add 2nd tab warning #}
<script type="text/javascript" src="second-tab-warning.js"></script>
Expand Down
9 changes: 9 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,15 @@ After you are done modifying/adding/deleting files/folders, don't forget to appl
You can move the whole docker library and all its files including all Nextcloud AIO files and folders to a separate drive by first mounting the drive in the host OS (NTFS is not supported and ext4 is recommended as FS) and then following this tutorial: https://www.guguweb.com/2019/02/07/how-to-move-docker-data-directory-to-another-location-on-ubuntu/<br>
(Of course docker needs to be installed first for this to work.)

⚠️ If you encounter errors from richdocuments in your Nextcloud logs, check in your Collabora container if the message "Capabilities are not set for the coolforkit program." appears. If so, follow these steps:

1. Stop all the containers from the AIO Interface.
2. Go to your terminal and delete the Collabora container (`docker rm nextcloud-aio-collabora`) AND the Collabora image (`docker image rm nextcloud/aio-collabora`).
3. You might also want to prune your Docker (`docker system prune`) (no data will be lost).
4. Restart your containers from the AIO Interface.

This should solve the problem.

### How to edit Nextclouds config.php file with a texteditor?
You can edit Nextclouds config.php file directly from the host with your favorite text editor. E.g. like this: `sudo docker run -it --rm --volume nextcloud_aio_nextcloud:/var/www/html:rw alpine sh -c "apk add --no-cache nano && nano /var/www/html/config/config.php"`. Make sure to not break the file though which might corrupt your Nextcloud instance otherwise. In best case, create a backup using the built-in backup solution before editing the file.

Expand Down

0 comments on commit aacd537

Please sign in to comment.