Update version in -focal image as well
This commit is contained in:
parent
1a34f6ac4f
commit
eef819e0b7
|
@ -4,11 +4,11 @@
|
||||||
FROM ubuntu:focal-20210827 as ckanbuild
|
FROM ubuntu:focal-20210827 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.8-focal
|
ENV IMAGE_TAG=2.9.9-focal
|
||||||
|
|
||||||
# Set CKAN version to build
|
# Set CKAN version to build
|
||||||
ENV GIT_URL=https://github.com/ckan/ckan.git
|
ENV GIT_URL=https://github.com/ckan/ckan.git
|
||||||
ENV GIT_BRANCH=ckan-2.9.8
|
ENV GIT_BRANCH=ckan-2.9.9
|
||||||
|
|
||||||
# Set timezone
|
# Set timezone
|
||||||
ENV TZ=UTC
|
ENV TZ=UTC
|
||||||
|
@ -32,29 +32,29 @@ RUN update-locale LANG=${LC_ALL}
|
||||||
|
|
||||||
# Instal apt-utils
|
# Instal apt-utils
|
||||||
RUN apt-get install --no-install-recommends -y \
|
RUN apt-get install --no-install-recommends -y \
|
||||||
apt-utils
|
apt-utils
|
||||||
|
|
||||||
# Packages to build CKAN requirements and plugins
|
# Packages to build CKAN requirements and plugins
|
||||||
RUN apt-get install --no-install-recommends -y \
|
RUN apt-get install --no-install-recommends -y \
|
||||||
git \
|
git \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
python3 \
|
python3 \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
linux-headers-generic \
|
linux-headers-generic \
|
||||||
gcc-10 \
|
gcc-10 \
|
||||||
make \
|
make \
|
||||||
g++-10 \
|
g++-10 \
|
||||||
autoconf \
|
autoconf \
|
||||||
automake \
|
automake \
|
||||||
libtool \
|
libtool \
|
||||||
patch \
|
patch \
|
||||||
libpcre3-dev \
|
libpcre3-dev \
|
||||||
libpcre3 \
|
libpcre3 \
|
||||||
python3-dev \
|
python3-dev \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
libxslt-dev
|
libxslt-dev
|
||||||
|
|
||||||
# Use gcc 10
|
# Use gcc 10
|
||||||
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10 --slave /usr/bin/x86_64-linux-gnu-gcc x86_64-linux-gnu-gcc /usr/bin/x86_64-linux-gnu-gcc-10
|
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10 --slave /usr/bin/x86_64-linux-gnu-gcc x86_64-linux-gnu-gcc /usr/bin/x86_64-linux-gnu-gcc-10
|
||||||
|
@ -102,11 +102,11 @@ ENV ENVVARS_GIT_BRANCH=0.0.1
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install --no-install-recommends -y \
|
apt-get install --no-install-recommends -y \
|
||||||
git \
|
git \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
python3 \
|
python3 \
|
||||||
python3-dev
|
python3-dev
|
||||||
|
|
||||||
# Link python to python3
|
# Link python to python3
|
||||||
RUN ln -s /usr/bin/python3 /usr/bin/python
|
RUN ln -s /usr/bin/python3 /usr/bin/python
|
||||||
|
@ -158,21 +158,21 @@ ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher
|
||||||
# Install necessary packages to run CKAN
|
# Install necessary packages to run CKAN
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install --no-install-recommends -y \
|
apt-get install --no-install-recommends -y \
|
||||||
gettext \
|
gettext \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
libpq5 \
|
libpq5 \
|
||||||
git \
|
git \
|
||||||
postgresql-client \
|
postgresql-client \
|
||||||
python3 \
|
python3 \
|
||||||
python3-distutils \
|
python3-distutils \
|
||||||
libpython3.8 \
|
libpython3.8 \
|
||||||
libmagic1 \
|
libmagic1 \
|
||||||
libpcre3 \
|
libpcre3 \
|
||||||
libxslt1.1 \
|
libxslt1.1 \
|
||||||
libxml2 \
|
libxml2 \
|
||||||
tzdata \
|
tzdata \
|
||||||
apache2-utils && \
|
apache2-utils && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
# Create SRC_DIR
|
# Create SRC_DIR
|
||||||
mkdir -p ${SRC_DIR} && \
|
mkdir -p ${SRC_DIR} && \
|
||||||
|
|
Loading…
Reference in New Issue