From b804c22a935c11c70f97139b34b9ff741837722d Mon Sep 17 00:00:00 2001 From: Brain Date: Mon, 4 Dec 2023 19:45:08 +0100 Subject: [PATCH 1/2] Use Gitea registry for base images --- .drone.yml | 7 ++----- Dockerfile | 4 ++-- README.md | 19 ------------------- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8629570..3ef71bb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ trigger: steps: - name: install-lint-test - image: registry.wtf-eg.net/ki-backend-builder:1.0.0 + image: git.wtf-eg.de/kompetenzinventar/builder:1.0.2 commands: - pipenv install --dev - pipenv run flake8 @@ -91,7 +91,7 @@ trigger: steps: - name: install-lint-test - image: registry.wtf-eg.net/ki-backend-builder:1.0.0 + image: git.wtf-eg.de/kompetenzinventar/builder:1.0.2 commands: - pipenv install --dev - pipenv run flake8 @@ -108,6 +108,3 @@ steps: from_secret: "docker_username" password: from_secret: "docker_password" - -image_pull_secrets: - - dockerconfig diff --git a/Dockerfile b/Dockerfile index c5ebeaa..dd0efbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later -FROM registry.wtf-eg.net/ki-backend-builder:1.0.1 as builder +FROM git.wtf-eg.de/kompetenzinventar/builder:1.0.2 as builder COPY Pipfile* ./ @@ -10,7 +10,7 @@ RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore- RUN pip3 uninstall --yes pipenv -FROM registry.wtf-eg.net/ki-backend-base:1.0.1 as ki-backend +FROM git.wtf-eg.de/kompetenzinventar/base:1.0.2 as ki-backend # Install six explicitly. Otherwise Python complains about it missing. RUN pip3 install six diff --git a/README.md b/README.md index e3b277e..382da74 100644 --- a/README.md +++ b/README.md @@ -222,25 +222,6 @@ docker-compose up Dann http://localhost:13337 aufrufen. -### Workaround, falls der Zugriff auf registry.wtf-eg.net nicht möglich ist - -Voraussetzung: - -[ki-backend-docker](https://git.wtf-eg.de/kompetenzinventar/ki-backend-docker) muss parallel zum `ki-backend` ausgecheckt sein. - -``` -cd ki-backend-docker -docker build . --target base -t ki-backend-base -docker build . --target builder -t ki-backend-builder -``` - -Ändern der 2 Einträge im `Dockerfile` des `ki-backend`: - -- registry.wtf-eg.net/ki-backend-builder:1.0.0 -> ki-backend-builder -- registry.wtf-eg.net/ki-backend-base:1.0.0 -> ki-backend-base - -Danach sollte `docker-compose up` funktionieren. - ## Lizenzen Dieses Projekt erfüllt die [REUSE](https://reuse.software/) Spezifikation. From fdc81844b503880df59be282bdef78945032920e Mon Sep 17 00:00:00 2001 From: Brain Date: Mon, 4 Dec 2023 19:51:27 +0100 Subject: [PATCH 2/2] Push image to Gitea registry --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3ef71bb..1af29d9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,8 +43,8 @@ steps: - name: docker-publish image: plugins/docker settings: - registry: registry.wtf-eg.net - repo: registry.wtf-eg.net/ki-backend + registry: git.wtf-eg.de + repo: git.wtf-eg.de/kompetenzinventar/backend target: ki-backend auto_tag: true username: @@ -100,8 +100,8 @@ steps: - name: docker-publish image: plugins/docker settings: - registry: registry.wtf-eg.net - repo: registry.wtf-eg.net/ki-backend + registry: git.wtf-eg.de + repo: git.wtf-eg.de/kompetenzinventar/backend target: ki-backend auto_tag: true username: