change CI to fully build the image
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Some checks reported errors
continuous-integration/drone/push Build encountered an error
This commit is contained in:
parent
722e05d4f3
commit
1dfeb16d03
3 changed files with 31 additions and 6 deletions
|
@ -2,6 +2,10 @@ kind: pipeline
|
||||||
type: kubernetes
|
type: kubernetes
|
||||||
name: deploy
|
name: deploy
|
||||||
steps:
|
steps:
|
||||||
|
- name: patch
|
||||||
|
image: git.ar21.de/aaron/kustomize-ci
|
||||||
|
commands:
|
||||||
|
- "sh patch-nextcloud.sh"
|
||||||
- name: docker
|
- name: docker
|
||||||
image: thegeeklab/drone-docker-buildx
|
image: thegeeklab/drone-docker-buildx
|
||||||
privileged: true
|
privileged: true
|
||||||
|
@ -11,7 +15,7 @@ steps:
|
||||||
from_secret: REGISTRY_USER
|
from_secret: REGISTRY_USER
|
||||||
password:
|
password:
|
||||||
from_secret: REGISTRY_PASS
|
from_secret: REGISTRY_PASS
|
||||||
repo: git.ar21.de/aaron/nextcloud-fpm
|
repo: git.ar21.de/aaron/nextcloud-fpm-test
|
||||||
tags: latest
|
tags: latest
|
||||||
platforms:
|
platforms:
|
||||||
- linux/arm64
|
- linux/arm64
|
||||||
|
@ -42,3 +46,4 @@ when:
|
||||||
event:
|
event:
|
||||||
include:
|
include:
|
||||||
- push
|
- push
|
||||||
|
- custom
|
|
@ -1,4 +0,0 @@
|
||||||
FROM nextcloud:29.0.3-fpm
|
|
||||||
RUN apt-get update && apt-get install -y libmagickcore-6.q16-6-extra tesseract-ocr tesseract-ocr-deu tesseract-ocr-eng ocrmypdf libbz2-dev && docker-php-ext-install bz2 && apt-get clean autoclean && apt-get autoremove -y
|
|
||||||
ADD https://raw.githubusercontent.com/tesseract-ocr/tessdata/main/deu.traineddata /usr/share/tesseract-ocr/tessdata/
|
|
||||||
ADD https://raw.githubusercontent.com/tesseract-ocr/tessdata/main/eng.traineddata /usr/share/tesseract-ocr/tessdata/
|
|
24
patch-nextcloud.sh
Normal file
24
patch-nextcloud.sh
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
#!/usr/bin/env sh
|
||||||
|
set -e
|
||||||
|
set -x
|
||||||
|
echo "starting patch script"
|
||||||
|
echo "clone nextcloud/docker"
|
||||||
|
git clone https://git.ar21.de/aaron/nextcloud-docker.git
|
||||||
|
echo "get latest major version"
|
||||||
|
major_version=$(find nextcloud-docker -maxdepth 1 -type d -printf "%f\n" | grep -E '^[0-9]+$' | sort -n | tail -1)
|
||||||
|
if [ -z "nextcloud-docker/$major_version" ]; then
|
||||||
|
echo "Could not determine version."
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
echo "Nextcloud $major_version found"
|
||||||
|
fi
|
||||||
|
echo "patch the Dockerfile"
|
||||||
|
cd "nextcloud-docker/$major_version/fpm/"
|
||||||
|
sed -i "$(awk '/^ENTRYPOINT /{line=NR} END{print line}' Dockerfile)s+^+# begin of patch\nRUN apt-get update && apt-get install -y libmagickcore-6.q16-6-extra tesseract-ocr tesseract-ocr-deu tesseract-ocr-eng ocrmypdf libbz2-dev && docker-php-ext-install bz2 && apt-get clean autoclean && apt-get autoremove -y\nADD https://raw.githubusercontent.com/tesseract-ocr/tessdata/main/deu.traineddata /usr/share/tesseract-ocr/tessdata/\nADD https://raw.githubusercontent.com/tesseract-ocr/tessdata/main/eng.traineddata /usr/share/tesseract-ocr/tessdata/\n# end of patch\n+" Dockerfile
|
||||||
|
echo "determine tags"
|
||||||
|
full_version=$(grep -oP '(?<=^ENV NEXTCLOUD_VERSION ).*' Dockerfile)
|
||||||
|
echo "found $full_version"
|
||||||
|
cd ~
|
||||||
|
echo $full_version > .tags
|
||||||
|
echo "move Dockerfile to workdir"
|
||||||
|
cp nextcloud-docker/$major_version/fpm/Dockerfile .
|
Loading…
Reference in a new issue