From 14ddf0e5e33fb55bfa64683a9402a90b9a6b8252 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Mon, 25 Mar 2024 10:09:30 +0100
Subject: [PATCH] change registry to git.ar21.de

---
 .drone.yml     | 26 ++++++++++++++++++--------
 .gitlab-ci.yml | 50 --------------------------------------------------
 Dockerfile     |  4 ++--
 README.md      |  2 +-
 4 files changed, 21 insertions(+), 61 deletions(-)
 delete mode 100644 .gitlab-ci.yml

diff --git a/.drone.yml b/.drone.yml
index da53f27..1b47460 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,26 +2,36 @@ kind: pipeline
 name: deploy
 steps:
 - name: docker
-  image: plugins/docker
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
   settings:
+    registry: git.ar21.de
     username:
-      from_secret: DOCKER_USERNAME
+      from_secret: REGISTRY_USER
     password:
-      from_secret: DOCKER_PASSWORD
-    repo: aaronriedel/nextcloud-fpm
+      from_secret: REGISTRY_PASS
+    repo: git.ar21.de/aaron/nextcloud-fpm
     tags: latest
+    platforms:
+      - linux/arm64
+      - linux/amd64
   when:
     branch:
       - main
 - name: docker-build
-  image: plugins/docker
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
   settings:
+    registry: git.ar21.de
     username:
-      from_secret: DOCKER_USERNAME
+      from_secret: REGISTRY_USER
     password:
-      from_secret: DOCKER_PASSWORD
-    repo: aaronriedel/nextcloud-fpm
+      from_secret: REGISTRY_PASS
+    repo: git.ar21.de/aaron/nextcloud-fpm
     tags: latest
+    platforms:
+      - linux/arm64
+      - linux/amd64
     dry_run: true
   when:
     branch:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index e4fb3f4..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 3cb2f53..b9ec738 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
 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/
\ No newline at end of file
+ADD https://raw.githubusercontent.com/tesseract-ocr/tessdata/main/eng.traineddata /usr/share/tesseract-ocr/tessdata/
diff --git a/README.md b/README.md
index ef18ad0..c6f4466 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 # nextcloud-fpm
 
 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)
\ No newline at end of file
+pushes automatically to [git.ar21.de/aaron/nextcloud-fpm](https://git.ar21.de/aaron/-/packages/container/nextcloud-fpm/latest)
\ No newline at end of file