change registry to git.ar21.de
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
1269e0ec8b
commit
14ddf0e5e3
4 changed files with 21 additions and 61 deletions
26
.drone.yml
26
.drone.yml
|
@ -2,26 +2,36 @@ kind: pipeline
|
||||||
name: deploy
|
name: deploy
|
||||||
steps:
|
steps:
|
||||||
- name: docker
|
- name: docker
|
||||||
image: plugins/docker
|
image: thegeeklab/drone-docker-buildx
|
||||||
|
privileged: true
|
||||||
settings:
|
settings:
|
||||||
|
registry: git.ar21.de
|
||||||
username:
|
username:
|
||||||
from_secret: DOCKER_USERNAME
|
from_secret: REGISTRY_USER
|
||||||
password:
|
password:
|
||||||
from_secret: DOCKER_PASSWORD
|
from_secret: REGISTRY_PASS
|
||||||
repo: aaronriedel/nextcloud-fpm
|
repo: git.ar21.de/aaron/nextcloud-fpm
|
||||||
tags: latest
|
tags: latest
|
||||||
|
platforms:
|
||||||
|
- linux/arm64
|
||||||
|
- linux/amd64
|
||||||
when:
|
when:
|
||||||
branch:
|
branch:
|
||||||
- main
|
- main
|
||||||
- name: docker-build
|
- name: docker-build
|
||||||
image: plugins/docker
|
image: thegeeklab/drone-docker-buildx
|
||||||
|
privileged: true
|
||||||
settings:
|
settings:
|
||||||
|
registry: git.ar21.de
|
||||||
username:
|
username:
|
||||||
from_secret: DOCKER_USERNAME
|
from_secret: REGISTRY_USER
|
||||||
password:
|
password:
|
||||||
from_secret: DOCKER_PASSWORD
|
from_secret: REGISTRY_PASS
|
||||||
repo: aaronriedel/nextcloud-fpm
|
repo: git.ar21.de/aaron/nextcloud-fpm
|
||||||
tags: latest
|
tags: latest
|
||||||
|
platforms:
|
||||||
|
- linux/arm64
|
||||||
|
- linux/amd64
|
||||||
dry_run: true
|
dry_run: true
|
||||||
when:
|
when:
|
||||||
branch:
|
branch:
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
stages: # List of stages for jobs, and their order of execution
|
|
||||||
- build
|
|
||||||
- test
|
|
||||||
|
|
||||||
docker-build-push:
|
|
||||||
# Use the official docker image.
|
|
||||||
image: docker:latest
|
|
||||||
stage: build
|
|
||||||
services:
|
|
||||||
- docker:dind
|
|
||||||
before_script:
|
|
||||||
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
|
||||||
# Default branch leaves tag empty (= latest tag)
|
|
||||||
# All other branches are tagged with the escaped branch name (commit ref slug)
|
|
||||||
script:
|
|
||||||
- |
|
|
||||||
if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
|
|
||||||
tag=""
|
|
||||||
echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
|
|
||||||
else
|
|
||||||
tag=":$CI_COMMIT_REF_SLUG"
|
|
||||||
echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
|
|
||||||
fi
|
|
||||||
- docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
|
|
||||||
- docker push "$CI_REGISTRY_IMAGE${tag}"
|
|
||||||
allow_failure: false
|
|
||||||
only:
|
|
||||||
- main
|
|
||||||
|
|
||||||
docker-build:
|
|
||||||
image: docker:latest
|
|
||||||
stage: build
|
|
||||||
services:
|
|
||||||
- docker:dind
|
|
||||||
before_script:
|
|
||||||
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
|
||||||
script:
|
|
||||||
- docker build --pull -t "$CI_REGISTRY_IMAGE" .
|
|
||||||
allow_failure: false
|
|
||||||
except:
|
|
||||||
- main
|
|
||||||
|
|
||||||
include:
|
|
||||||
- template: Security/Container-Scanning.gitlab-ci.yml
|
|
||||||
- template: Security/SAST.gitlab-ci.yml
|
|
||||||
container_scanning:
|
|
||||||
variables:
|
|
||||||
DOCKER_IMAGE: "$CI_REGISTRY_IMAGE${tag}"
|
|
||||||
stage: test
|
|
||||||
allow_failure: false
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM amd64/nextcloud:28.0.3-fpm
|
FROM nextcloud:28.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
|
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/deu.traineddata /usr/share/tesseract-ocr/tessdata/
|
||||||
ADD https://raw.githubusercontent.com/tesseract-ocr/tessdata/main/eng.traineddata /usr/share/tesseract-ocr/tessdata/
|
ADD https://raw.githubusercontent.com/tesseract-ocr/tessdata/main/eng.traineddata /usr/share/tesseract-ocr/tessdata/
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# nextcloud-fpm
|
# nextcloud-fpm
|
||||||
|
|
||||||
like the official nextcloud:fpm image but with added php imagick and teseract ocr
|
like the official nextcloud:fpm image but with added php imagick and teseract ocr
|
||||||
pushes automatically to [aaronriedel/nextcloud-fpm](https://hub.docker.com/r/aaronriedel/nextcloud-fpm)
|
pushes automatically to [git.ar21.de/aaron/nextcloud-fpm](https://git.ar21.de/aaron/-/packages/container/nextcloud-fpm/latest)
|
Loading…
Reference in a new issue