Merge pull request #108 from keitaroinc/alpine-update
updated alpine version of 2.9
This commit is contained in:
commit
7e5cf6b08d
|
@ -1,7 +1,7 @@
|
||||||
##################
|
##################
|
||||||
### Build CKAN ###
|
### Build CKAN ###
|
||||||
##################
|
##################
|
||||||
FROM alpine:3.13.7 as ckanbuild
|
FROM alpine:3.15 as ckanbuild
|
||||||
|
|
||||||
# Used by Github Actions to tag the image with
|
# Used by Github Actions to tag the image with
|
||||||
ENV IMAGE_TAG=2.9.9
|
ENV IMAGE_TAG=2.9.9
|
||||||
|
@ -57,16 +57,20 @@ RUN pip install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan
|
||||||
COPY ./patches ${SRC_DIR}/patches
|
COPY ./patches ${SRC_DIR}/patches
|
||||||
COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh
|
COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh
|
||||||
# Apply patches
|
# Apply patches
|
||||||
RUN ${SRC_DIR}/apply_ckan_patches.sh
|
RUN cd ${SRC_DIR} && ls -lah ${SRC_DIR} && ash ${SRC_DIR}/apply_ckan_patches.sh
|
||||||
RUN rm -rf /srv/app/src/ckan/.git
|
RUN rm -rf /srv/app/src/ckan/.git
|
||||||
|
|
||||||
|
#### PATCH SINCE CYTON UPDATED TO 3.0.0 ###
|
||||||
|
RUN sed -i 's/pyyaml==5.4.1/pyyaml>=6.0.1/g' ckan/requirements.txt
|
||||||
|
|
||||||
|
# RUN pip-compile ckan/requirements.in
|
||||||
RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt
|
RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt
|
||||||
RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==21.12.0 greenlet==1.1.3
|
RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==21.12.0 greenlet==1.1.3
|
||||||
|
|
||||||
|
|
||||||
###########################
|
###########################
|
||||||
### Default-Extensions ####
|
### Default-Extensions ####
|
||||||
###########################
|
###########################
|
||||||
FROM alpine:3.13.7 as extbuild
|
FROM alpine:3.15 as extbuild
|
||||||
|
|
||||||
# Set src dirs
|
# Set src dirs
|
||||||
ENV SRC_DIR=/srv/app/src
|
ENV SRC_DIR=/srv/app/src
|
||||||
|
@ -101,7 +105,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
|
||||||
############
|
############
|
||||||
### MAIN ###
|
### MAIN ###
|
||||||
############
|
############
|
||||||
FROM alpine:3.13.7
|
FROM alpine:3.15
|
||||||
|
|
||||||
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
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue