Merge branch 'service-updates' of kemonine/docs into master
This commit is contained in:
commit
761dda63c1
|
@ -25,29 +25,6 @@ chown -R www-data: /var/nextcloud
|
||||||
cat > /scratch/docker/nextcloud.sh <<EOF
|
cat > /scratch/docker/nextcloud.sh <<EOF
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
ARCH=\`arch\`
|
|
||||||
UPSTREAM="arm32v7/nextcloud:stable"
|
|
||||||
|
|
||||||
# Cleanup arch/container image here
|
|
||||||
if [ \$ARCH == "aarch64" ]
|
|
||||||
then
|
|
||||||
echo "64bit arm"
|
|
||||||
UPSTREAM="arm64v8/nextcloud:stable"
|
|
||||||
else
|
|
||||||
echo "32bit arm"
|
|
||||||
UPSTREAM="arm32v7/nextcloud:stable"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Updating"
|
|
||||||
|
|
||||||
docker pull \$UPSTREAM
|
|
||||||
|
|
||||||
echo "Running with latest release"
|
|
||||||
|
|
||||||
# Cleanup existing container
|
|
||||||
docker stop nextcloud
|
|
||||||
docker rm nextcloud
|
|
||||||
|
|
||||||
##########
|
##########
|
||||||
# For postgresql instead of sqlite run the following commands
|
# For postgresql instead of sqlite run the following commands
|
||||||
#docker exec -it postgres psql -U postgres
|
#docker exec -it postgres psql -U postgres
|
||||||
|
@ -57,7 +34,19 @@ docker rm nextcloud
|
||||||
# Setup using the above database/username/role and ip of 172.30.12.12
|
# Setup using the above database/username/role and ip of 172.30.12.12
|
||||||
##########
|
##########
|
||||||
|
|
||||||
# Re-run/create container with latest image
|
ARCH=\`arch\`
|
||||||
|
if [ \$ARCH == "aarch64" ]
|
||||||
|
then
|
||||||
|
ARCH="arm64v8"
|
||||||
|
else
|
||||||
|
ARCH="arm32v7"
|
||||||
|
fi
|
||||||
|
|
||||||
|
docker pull registry.lollipopcloud.solutions/\$ARCH/nextcloud
|
||||||
|
|
||||||
|
docker container stop nextcloud
|
||||||
|
docker container rm nextcloud
|
||||||
|
|
||||||
docker run \\
|
docker run \\
|
||||||
--name nextcloud \\
|
--name nextcloud \\
|
||||||
--restart unless-stopped \\
|
--restart unless-stopped \\
|
||||||
|
@ -66,7 +55,7 @@ docker run \\
|
||||||
-e TZ=UTC \\
|
-e TZ=UTC \\
|
||||||
-e DEBUG=1 \\
|
-e DEBUG=1 \\
|
||||||
-v /var/nextcloud:/var/www/html \\
|
-v /var/nextcloud:/var/www/html \\
|
||||||
\$UPSTREAM
|
registry.lollipopcloud.solutions/\$ARCH/nextcloud
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
|
@ -36,40 +36,32 @@ cat > /scratch/docker/pi-hole.sh <<EOF
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
ARCH=\`arch\`
|
ARCH=\`arch\`
|
||||||
UPSTREAM=""
|
|
||||||
|
|
||||||
# Cleanup arch/container image here
|
|
||||||
if [ \$ARCH == "aarch64" ]
|
if [ \$ARCH == "aarch64" ]
|
||||||
then
|
then
|
||||||
echo "64bit arm"
|
ARCH="arm64v8"
|
||||||
UPSTREAM="registry.lollipopcloud.solutions/arm64v8/pi-hole:v3.3"
|
|
||||||
else
|
else
|
||||||
echo "32bit arm"
|
ARCH="arm32v7"
|
||||||
UPSTREAM="registry.lollipopcloud.solutions/arm32v7/pi-hole:v3.3"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Updating"
|
docker pull registry.lollipopcloud.solutions/\$ARCH/pihole
|
||||||
docker pull \$UPSTREAM
|
|
||||||
|
|
||||||
# Cleanup existing container
|
docker stop pihole
|
||||||
docker stop pi-hole
|
docker rm pihole
|
||||||
docker rm pi-hole
|
|
||||||
|
|
||||||
# Re-run/create container with latest image
|
|
||||||
docker run \\
|
docker run \\
|
||||||
--name pi-hole \\
|
--name pihole \\
|
||||||
--restart unless-stopped \\
|
--restart unless-stopped \\
|
||||||
--memory=128m \\
|
--memory=128m \\
|
||||||
--net docker-private \\
|
--net docker-private \\
|
||||||
--ip 172.30.5.5 \\
|
--ip 172.30.5.5 \\
|
||||||
-e ServerIP=172.30.5.5 \\
|
-e ServerIP=172.30.5.5 \\
|
||||||
-e DNS1=172.30.0.1 \\
|
-e DNS1=172.30.0.1 \\
|
||||||
-e TZ=UTC \\
|
-e DNS2=none \\
|
||||||
-e WEBPASSWORD=[adecentpassword] \\
|
-e WEBPASSWORD=BADPASSWORD \\
|
||||||
-e DEBUG=1 \\
|
-e DEBUG=1 \\
|
||||||
-v /var/pihole/data:/etc/pihole \\
|
-v /var/pihole/data:/etc/pihole \\
|
||||||
-v /var/pihole/dnsmasq.d:/etc/dnsmasq.d \\
|
-v /var/pihole/dnsmasq.d:/etc/dnsmasq.d \\
|
||||||
\$UPSTREAM
|
registry.lollipopcloud.solutions/\$ARCH/pihole
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
|
@ -21,26 +21,18 @@ cat > /scratch/docker/searx/searx.sh << EOF
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
ARCH=\`arch\`
|
ARCH=\`arch\`
|
||||||
UPSTREAM=""
|
|
||||||
|
|
||||||
# Cleanup arch/container image here
|
|
||||||
if [ \$ARCH == "aarch64" ]
|
if [ \$ARCH == "aarch64" ]
|
||||||
then
|
then
|
||||||
echo "64bit arm"
|
ARCH="arm64v8"
|
||||||
UPSTREAM="registry.lollipopcloud.solutions/arm64v8/searx:v0.14.0"
|
|
||||||
else
|
else
|
||||||
echo "32bit arm"
|
ARCH="arm32v7"
|
||||||
UPSTREAM="registry.lollipopcloud.solutions/arm32v7/searx:v0.14.0"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Updating"
|
docker pull registry.lollipopcloud.solutions/\$ARCH/searx:latest
|
||||||
docker pull \$UPSTREAM
|
|
||||||
|
|
||||||
# Cleanup existing container
|
|
||||||
docker stop searx
|
docker stop searx
|
||||||
docker rm searx
|
docker rm searx
|
||||||
|
|
||||||
# Re-run/create container with latest image
|
|
||||||
docker run \\
|
docker run \\
|
||||||
--name searx \\
|
--name searx \\
|
||||||
--restart unless-stopped \\
|
--restart unless-stopped \\
|
||||||
|
@ -48,8 +40,8 @@ docker run \\
|
||||||
--ip 172.30.8.8 \\
|
--ip 172.30.8.8 \\
|
||||||
-e TZ=UTC \\
|
-e TZ=UTC \\
|
||||||
-e DEBUG=1 \\
|
-e DEBUG=1 \\
|
||||||
-e BASE_URL=searx.domain.tld \\
|
-e BASE_URL=searx.kemonine.online \\
|
||||||
\$UPSTREAM
|
registry.lollipopcloud.solutions/\$ARCH/searx:latest
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
chmod a+x /scratch/docker/searx/searx.sh
|
chmod a+x /scratch/docker/searx/searx.sh
|
||||||
|
|
Reference in New Issue