Merge branch 'master' into patch-1

This commit is contained in:
Blagoja Stojkoski 2022-01-20 16:12:46 +01:00 committed by GitHub
commit aaba1d739b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
############# #############
### Build ### ### Build ###
############# #############
FROM alpine:3.14.2 as build FROM alpine:3.13.7 as build
# Used by Github Actions to tag the image with # Used by Github Actions to tag the image with
ENV IMAGE_TAG=0.0.17 ENV IMAGE_TAG=0.0.17
@ -56,7 +56,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.1
############ ############
### MAIN ### ### MAIN ###
############ ############
FROM alpine:3.14.2 FROM alpine:3.13.7
LABEL maintainer="Keitaro Inc <info@keitaro.com>" LABEL maintainer="Keitaro Inc <info@keitaro.com>"
LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan