Skip to content

Commit 9098f6a

Browse files
Merge pull request #171 from aodn/docker_python_update
various updates to Dockerfile including:
2 parents c695897 + 0a1cbc3 commit 9098f6a

2 files changed

Lines changed: 10 additions & 17 deletions

File tree

Dockerfile

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,14 @@ ENV TZ=Australia/Hobart
77
ENV LC_ALL C.UTF-8
88
ENV LANG C.UTF-8
99
ENV PATH /home/builder/.local/bin:$PATH
10-
ENV PYTHON_VERSION 3.5.2
10+
ENV PYTHON_VERSION 3.8.13
1111

1212
RUN apt-get update && \
1313
apt-get install -y software-properties-common && \
1414
rm -rf /var/lib/apt/lists/*
1515

1616
RUN add-apt-repository ppa:rael-gc/rvm && apt-get update
1717

18-
RUN if [ X"$PYTHON_VERSION" = X"3.5.2" ]; \
19-
then apt-get install -y libssl1.0-dev; \
20-
else apt-get install -y libssl-dev; \
21-
fi
22-
2318
RUN apt-get install -y --no-install-recommends \
2419
build-essential \
2520
ca-certificates \
@@ -29,11 +24,10 @@ RUN apt-get install -y --no-install-recommends \
2924
python3-dev \
3025
wget \
3126
libffi-dev \
32-
# Pyenv pre-requisites
33-
make zlib1g-dev libbz2-dev libreadline-dev \
34-
libsqlite3-dev wget curl llvm libncurses5-dev \
35-
libncursesw5-dev xz-utils tk-dev libffi-dev \
36-
liblzma-dev python-openssl \
27+
# Pyenv pre-requisites (from https://github.com/pyenv/pyenv/wiki#suggested-build-environment)
28+
make build-essential libssl-dev zlib1g-dev \
29+
libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \
30+
libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \
3731
&& rm -rf /var/lib/apt/lists/*
3832

3933
# Set-up necessary Env vars for PyEnv
@@ -48,13 +42,12 @@ RUN set -ex \
4842
&& pyenv rehash \
4943
&& chmod -R a+w $PYENV_ROOT/shims
5044

51-
RUN pip install --upgrade pip==20.3.4 setuptools==50.3.2
45+
RUN pip install --upgrade pip==22.1.2 setuptools==63.1.0 wheel
5246

5347
RUN pip install \
54-
Cython==0.29 \
55-
numpy>=1.13.0 \
56-
bump2version==0.5.10 \
57-
wheel
48+
Cython==0.29.30 \
49+
bump2version==1.0.1 \
50+
numpy==1.23.0
5851

5952
RUN useradd --create-home --no-log-init --shell /bin/bash --uid $BUILDER_UID builder
6053
USER builder

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '2'
22

33
services:
44
dev:
5-
image: ncwriter-build
5+
image: aodntools-build
66
build:
77
context: .
88
args:

0 commit comments

Comments
 (0)