Skip to content

Commit

Permalink
Merge pull request #407 from kjsanger/feature/baton-5.0.0
Browse files Browse the repository at this point in the history
Bump baton from 4.3.2 to 5.0.0
  • Loading branch information
kjsanger authored Feb 3, 2025
2 parents c723d8b + 36e3e25 commit cf6f434
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

FROM --platform=linux/amd64 ubuntu:bionic AS builder

ARG PYTHON_VERSION=3.12
Expand Down Expand Up @@ -36,11 +35,12 @@ RUN /app/docker/install_pyenv.sh
RUN pyenv install "$PYTHON_VERSION"
RUN pyenv global "$PYTHON_VERSION"


# This drives the choice of base system for this Dockerfile. iRODS 4.2.11 is not
# available for anything more recent than Ubuntu bionic, so that's what we use for
# the builder (above) and for the clients. This is also the reason we resort to
# pyenv to get a recent Python, rather than using a python-slim base image.
FROM --platform=linux/amd64 ghcr.io/wtsi-npg/ub-18.04-irods-clients-4.2.11
FROM --platform=linux/amd64 ghcr.io/wtsi-npg/ub-18.04-baton-irods-4.2.11:5.0.0

ENV DEBIAN_FRONTEND=noninteractive

Expand All @@ -51,6 +51,12 @@ RUN apt-get update && \
unattended-upgrades && \
unattended-upgrade -d -v

RUN echo "deb [arch=amd64] https://packages.irods.org/apt/ $(lsb_release -sc) main" |\
tee /etc/apt/sources.list.d/renci-irods.list && \
apt-get update && \
apt-get install -q -y --no-install-recommends \
irods-icommands="4.2.11-1~$(lsb_release -sc)"

ENV PYENV_ROOT="/app/.pyenv"

# Put PYENV first to ensure we use the pyenv-installed Python
Expand Down

0 comments on commit cf6f434

Please sign in to comment.