Skip to content

Commit 4d55c1b

Browse files
author
Phil Varner
committed
update python in docker image
Signed-off-by: Phil Varner <[email protected]>
1 parent d59bb56 commit 4d55c1b

File tree

3 files changed

+23
-14
lines changed

3 files changed

+23
-14
lines changed

build/circleci/Dockerfile

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM circleci/openjdk:8-jdk
22

3-
ENV OPENJPEG_VERSION 2.3.0
3+
ENV OPENJPEG_VERSION 2.3.1
44
ENV GDAL_VERSION 2.4.1
55
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
66

@@ -11,26 +11,37 @@ RUN sudo apt-get update && \
1111
python python-minimal python2.7 python2.7-minimal \
1212
libpython-stdlib libpython2.7 libpython2.7-minimal libpython2.7-stdlib \
1313
&& sudo apt-get install -y \
14-
python3 \
15-
python3-pip \
1614
pandoc \
1715
wget \
1816
gcc g++ build-essential \
17+
libreadline-gplv2-dev libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev \
1918
libcurl4-gnutls-dev \
2019
libproj-dev \
2120
libgeos-dev \
2221
libhdf4-alt-dev \
23-
libhdf5-serial-dev \
2422
bash-completion \
2523
cmake \
2624
imagemagick \
2725
libpng-dev \
28-
swig \
29-
ant \
26+
libffi-dev \
3027
&& sudo apt autoremove \
31-
&& sudo apt-get clean all \
32-
&& pip3 install setuptools ipython==6.2.1 \
33-
&& sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 1
28+
&& sudo apt-get clean all
29+
# && sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 1
30+
# todo s
31+
32+
RUN cd /tmp && \
33+
wget https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tgz && \
34+
tar xzf Python-3.7.4.tgz && \
35+
cd Python-3.7.4 && \
36+
./configure --with-ensurepip=install --prefix=/usr/local --enable-optimization && \
37+
make && \
38+
sudo make altinstall && \
39+
rm -rf Python-3.7.4*
40+
41+
RUN sudo ln -s /usr/local/bin/python3.7 /usr/local/bin/python && \
42+
sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
43+
sudo python get-pip.py && \
44+
sudo pip3 install setuptools ipython==6.2.1
3445

3546
# install OpenJPEG
3647
RUN cd /tmp && \
@@ -52,11 +63,9 @@ RUN cd /tmp && \
5263
./configure \
5364
--with-curl \
5465
--with-hdf4 \
55-
--with-hdf5 \
5666
--with-geos \
5767
--with-geotiff=internal \
5868
--with-hide-internal-symbols \
59-
--with-java=$JAVA_HOME \
6069
--with-libtiff=internal \
6170
--with-libz=internal \
6271
--with-mrf \
@@ -68,7 +77,5 @@ RUN cd /tmp && \
6877
&& \
6978
make -j 8 && \
7079
sudo make install && \
71-
cd swig/java && \
72-
sudo make install && \
7380
sudo ldconfig && \
7481
cd /tmp && sudo rm -Rf gdal*

build/circleci/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
all:
2+
docker build -t "s22s/rasterframes-circleci:latest" .

build/circleci/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CircleCI Dockerfile Build file
22

33
```bash
4-
docker build -t s22s/rasterframes-circleci:latest .
4+
make
55
docker push s22s/rasterframes-circleci:latest
66
```

0 commit comments

Comments
 (0)