Use Gitea registry for base images

This commit is contained in:
Brain 2023-12-04 19:45:08 +01:00
parent 9a7a9379e2
commit b804c22a93
Signed by untrusted user: Brain
GPG Key ID: EE936E31EE3AEE7A
3 changed files with 4 additions and 26 deletions

View File

@ -15,7 +15,7 @@ trigger:
steps: steps:
- name: install-lint-test - 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: commands:
- pipenv install --dev - pipenv install --dev
- pipenv run flake8 - pipenv run flake8
@ -91,7 +91,7 @@ trigger:
steps: steps:
- name: install-lint-test - 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: commands:
- pipenv install --dev - pipenv install --dev
- pipenv run flake8 - pipenv run flake8
@ -108,6 +108,3 @@ steps:
from_secret: "docker_username" from_secret: "docker_username"
password: password:
from_secret: "docker_password" from_secret: "docker_password"
image_pull_secrets:
- dockerconfig

View File

@ -2,7 +2,7 @@
# #
# SPDX-License-Identifier: AGPL-3.0-or-later # 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* ./ COPY Pipfile* ./
@ -10,7 +10,7 @@ RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore-
RUN pip3 uninstall --yes pipenv 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. # Install six explicitly. Otherwise Python complains about it missing.
RUN pip3 install six RUN pip3 install six

View File

@ -222,25 +222,6 @@ docker-compose up
Dann http://localhost:13337 aufrufen. 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 ## Lizenzen
Dieses Projekt erfüllt die [REUSE](https://reuse.software/) Spezifikation. Dieses Projekt erfüllt die [REUSE](https://reuse.software/) Spezifikation.