forked from kompetenzinventar/ki-backend
Merge pull request 'Improve Docker usage' (!80) from docker-improvements into main
Reviewed-on: kompetenzinventar/ki-backend#80
This commit is contained in:
commit
763a6efc9f
13
.dockerignore
Normal file
13
.dockerignore
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
*
|
||||||
|
!Pipfile
|
||||||
|
!Pipfile.lock
|
||||||
|
!data/
|
||||||
|
!ki/
|
||||||
|
!LICENSES/
|
||||||
|
!migrations/
|
||||||
|
!app.py
|
||||||
|
!run_prod.py
|
23
.drone.yml
23
.drone.yml
@ -15,16 +15,18 @@ trigger:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: install-lint-test
|
- name: install-lint-test
|
||||||
image: git.wtf-eg.de/kompetenzinventar/builder:1.0.2
|
image: python:3.8.18-alpine
|
||||||
|
env:
|
||||||
|
PYROOT: '/pyroot'
|
||||||
|
PYTHONUSERBASE: '/pyroot'
|
||||||
commands:
|
commands:
|
||||||
|
- apk add --no-cache gcc g++ musl-dev python3-dev
|
||||||
|
- pip3 install pipenv
|
||||||
- pipenv install --dev
|
- pipenv install --dev
|
||||||
- pipenv run flake8
|
- pipenv run flake8
|
||||||
- pipenv run reuse lint
|
- pipenv run reuse lint
|
||||||
- pipenv run python -m unittest discover ki
|
- pipenv run python -m unittest discover ki
|
||||||
|
|
||||||
image_pull_secrets:
|
|
||||||
- dockerconfig
|
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: docker
|
type: docker
|
||||||
@ -41,7 +43,7 @@ depends_on:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: docker-publish
|
- name: docker-publish
|
||||||
image: plugins/docker
|
image: plugins/docker:20.17.3
|
||||||
settings:
|
settings:
|
||||||
registry: git.wtf-eg.de
|
registry: git.wtf-eg.de
|
||||||
repo: git.wtf-eg.de/kompetenzinventar/backend
|
repo: git.wtf-eg.de/kompetenzinventar/backend
|
||||||
@ -68,7 +70,7 @@ depends_on:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: deploy-dev
|
- name: deploy-dev
|
||||||
image: appleboy/drone-ssh
|
image: appleboy/drone-ssh:1.7.5
|
||||||
settings:
|
settings:
|
||||||
host:
|
host:
|
||||||
- dev01.wtf-eg.net
|
- dev01.wtf-eg.net
|
||||||
@ -91,14 +93,19 @@ trigger:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: install-lint-test
|
- name: install-lint-test
|
||||||
image: git.wtf-eg.de/kompetenzinventar/builder:1.0.2
|
image: python:3.8.18-alpine
|
||||||
|
env:
|
||||||
|
PYROOT: '/pyroot'
|
||||||
|
PYTHONUSERBASE: '/pyroot'
|
||||||
commands:
|
commands:
|
||||||
|
- apk add --no-cache gcc g++ musl-dev python3-dev
|
||||||
|
- pip3 install pipenv
|
||||||
- pipenv install --dev
|
- pipenv install --dev
|
||||||
- pipenv run flake8
|
- pipenv run flake8
|
||||||
- pipenv run reuse lint
|
- pipenv run reuse lint
|
||||||
- pipenv run python -m unittest discover ki
|
- pipenv run python -m unittest discover ki
|
||||||
- name: docker-publish
|
- name: docker-publish
|
||||||
image: plugins/docker
|
image: plugins/docker:20.17.3
|
||||||
settings:
|
settings:
|
||||||
registry: git.wtf-eg.de
|
registry: git.wtf-eg.de
|
||||||
repo: git.wtf-eg.de/kompetenzinventar/backend
|
repo: git.wtf-eg.de/kompetenzinventar/backend
|
||||||
|
17
Dockerfile
17
Dockerfile
@ -2,7 +2,17 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
FROM git.wtf-eg.de/kompetenzinventar/builder:1.0.2 as builder
|
FROM python:3.8.18-alpine AS builder
|
||||||
|
|
||||||
|
ENV PYROOT=/pyroot
|
||||||
|
ENV PYTHONUSERBASE=$PYROOT
|
||||||
|
|
||||||
|
RUN apk add --no-cache \
|
||||||
|
gcc \
|
||||||
|
g++ \
|
||||||
|
musl-dev \
|
||||||
|
python3-dev && \
|
||||||
|
pip3 install pipenv
|
||||||
|
|
||||||
COPY Pipfile* ./
|
COPY Pipfile* ./
|
||||||
|
|
||||||
@ -10,7 +20,10 @@ RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore-
|
|||||||
RUN pip3 uninstall --yes pipenv
|
RUN pip3 uninstall --yes pipenv
|
||||||
|
|
||||||
|
|
||||||
FROM git.wtf-eg.de/kompetenzinventar/base:1.0.2 as ki-backend
|
FROM python:3.8.18-alpine AS ki-backend
|
||||||
|
|
||||||
|
ENV PYROOT=/pyroot
|
||||||
|
ENV PYTHONUSERBASE=$PYROOT
|
||||||
|
|
||||||
# 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
|
||||||
|
Loading…
Reference in New Issue
Block a user