switch to apache image
This commit is contained in:
parent
1d1c246aad
commit
d8ad483115
@ -1,12 +1,12 @@
|
|||||||
# Base image
|
# Base image
|
||||||
ARG NEXTCLOUD_VER
|
ARG NEXTCLOUD_VER
|
||||||
FROM nextcloud:${NEXTCLOUD_VER}-fpm
|
FROM nextcloud:${NEXTCLOUD_VER}-apache
|
||||||
|
|
||||||
# Install extra utilities
|
# Install extra utilities
|
||||||
|
|
||||||
RUN apt update && \
|
RUN apt update && \
|
||||||
apt install -y --no-install-recommends \
|
apt install -y --no-install-recommends \
|
||||||
sudo \
|
# sudo \
|
||||||
nano \
|
nano \
|
||||||
nfs-common \
|
nfs-common \
|
||||||
libreoffice \
|
libreoffice \
|
||||||
|
2
build.sh
2
build.sh
@ -5,6 +5,6 @@ REGISTRY="code.balsillie.net"
|
|||||||
ORG="containers"
|
ORG="containers"
|
||||||
IMAGE="nextcloud-supervisord"
|
IMAGE="nextcloud-supervisord"
|
||||||
IMAGE_FULL="$REGISTRY/$ORG/$IMAGE"
|
IMAGE_FULL="$REGISTRY/$ORG/$IMAGE"
|
||||||
docker build --pull -f ./Dockerfile --build-arg NEXTCLOUD_VER=$NEXTCLOUD_VER -t "$IMAGE_FULL:$NEXTCLOUD_VER" -t "$IMAGE_FULL:$DATE_TAG" .
|
docker build --no-cache --pull -f ./Dockerfile --build-arg NEXTCLOUD_VER=$NEXTCLOUD_VER -t "$IMAGE_FULL:$NEXTCLOUD_VER" -t "$IMAGE_FULL:$DATE_TAG" .
|
||||||
docker push -a "$IMAGE_FULL"
|
docker push -a "$IMAGE_FULL"
|
||||||
|
|
||||||
|
@ -7,12 +7,13 @@ logfile_maxbytes=50MB ; maximum size of logfile before
|
|||||||
logfile_backups=10 ; number of backed up logfiles
|
logfile_backups=10 ; number of backed up logfiles
|
||||||
loglevel=error
|
loglevel=error
|
||||||
|
|
||||||
[program:php-fpm]
|
[program:apache2]
|
||||||
stdout_logfile=/dev/stdout
|
stdout_logfile=/dev/stdout
|
||||||
stdout_logfile_maxbytes=0
|
stdout_logfile_maxbytes=0
|
||||||
stderr_logfile=/dev/stderr
|
stderr_logfile=/dev/stderr
|
||||||
stderr_logfile_maxbytes=0
|
stderr_logfile_maxbytes=0
|
||||||
command=php-fpm
|
# command=php-fpm
|
||||||
|
command=apache2-foreground
|
||||||
|
|
||||||
[program:cron]
|
[program:cron]
|
||||||
stdout_logfile=/dev/stdout
|
stdout_logfile=/dev/stdout
|
||||||
|
Loading…
Reference in New Issue
Block a user