Commit 1142862b authored by Jens Langhammer's avatar Jens Langhammer

Merge branch 'master' of git.beryju.org:BeryJu.org/pyazo

# Conflicts:
#	Dockerfile
parents 4d9501e3 bd885c42
Pipeline #3232 failed with stages
in 4 minutes and 32 seconds
[bumpversion]
current_version = 1.6.3
current_version = 1.8.8
tag = True
commit = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
......@@ -9,3 +9,7 @@ tag_name = debian/{new_version}
[bumpversion:file:pyazo/__init__.py]
[bumpversion:file:Dockerfile]
[bumpversion:file:.gitlab-ci.yml]
......@@ -32,6 +32,19 @@ coverage:
- coverage report
stage: test
package-docker:
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
before_script:
- echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"username\":\"$DOCKER_USERNAME\",\"password\":\"$DOCKER_PASSWORD\"}}}" > /kaniko/.docker/config.json
script:
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination beryjuorg/pyazo:stable --destination beryjuorg/pyazo:1.8.8
stage: build
only:
- tags
- docker-ci-test
- /^debian/.*$/
package-3.5:
before_script:
- apt update
......
FROM python:3.6-alpine
ARG REQUIREMENTS=requirements.txt
LABEL version="1.8.8"
COPY ${REQUIREMENTS} /
RUN apk update && \
apk add --no-cache openssl-dev libffi-dev libmagic libffi-dev build-base py2-pip python2-dev jpeg libxml2-dev libxslt-dev libffi-dev gcc musl-dev libgcc openssl-dev curl jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev bash && \
apk add --no-cache openssl-dev libffi-dev libmagic libffi-dev build-base py2-pip python2-dev jpeg libxml2-dev libxslt-dev libffi-dev gcc musl-dev libgcc openssl-dev curl jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev && \
pip install -r /${REQUIREMENTS} && \
apk del openssl-dev libffi-dev libffi-dev build-base py2-pip python2-dev libxml2-dev libxslt-dev libffi-dev gcc musl-dev libgcc openssl-dev curl jpeg-dev zlib-dev freetype-dev lcms2-dev tk-dev tcl-dev && \
adduser -S pyazo
......
"""pyazo version header"""
__version__ = '1.6.3'
__version__ = '1.8.8'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment