Skip to content

Commit

Permalink
upgrade stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
toniher committed Dec 19, 2024
1 parent eb960a2 commit a368113
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: true
max-parallel: 1
matrix:
branch: ['main']
branch: ['2', '2023']
folder: ['base', 'pyenv', 'pyenv3', 'pyenv23', 'pyenv-java', 'pyenv3-java', 'pyenv23-java']
steps:
-
Expand Down
7 changes: 1 addition & 6 deletions pyenv-java/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
FROM biocorecrg/amazonlinux-perlbrew-pyenv

# File Author / Maintainer
MAINTAINER Toni Hermoso Pulido <[email protected]>
MAINTAINER Luca Cozzuto <[email protected]>
FROM biocorecrg/amazonlinux-perlbrew-pyenv:2

ARG JAVA_VERSION=1.8.0
ARG MAVEN_VERSION=3.3.9

ENV JAVA_HOME /usr/lib/jvm/java-openjdk

# Install Redis
RUN yum update -y
# Install Java
RUN yum install -y java-$JAVA_VERSION-openjdk java-$JAVA_VERSION-openjdk-devel
Expand Down
2 changes: 1 addition & 1 deletion pyenv/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM biocorecrg/amazonlinux-perlbrew
FROM biocorecrg/amazonlinux-perlbrew:2

# File Author / Maintainer
MAINTAINER Toni Hermoso Pulido <[email protected]>
Expand Down
9 changes: 2 additions & 7 deletions pyenv23-java/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
FROM biocorecrg/amazonlinux-perlbrew-pyenv23

# File Author / Maintainer
MAINTAINER Toni Hermoso Pulido <[email protected]>
MAINTAINER Luca Cozzuto <[email protected]>
FROM biocorecrg/amazonlinux-perlbrew-pyenv23:2

ARG JAVA_VERSION=1.8.0
ARG MAVEN_VERSION=3.3.9

ENV JAVA_HOME /usr/lib/jvm/java-openjdk
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

# Install Redis
RUN yum update -y
# Install Java
RUN yum install -y java-$JAVA_VERSION-openjdk java-$JAVA_VERSION-openjdk-devel
Expand Down
12 changes: 4 additions & 8 deletions pyenv23/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
FROM biocorecrg/amazonlinux-perlbrew

# File Author / Maintainer
MAINTAINER Toni Hermoso Pulido <[email protected]>
MAINTAINER Luca Cozzuto <[email protected]>
FROM biocorecrg/amazonlinux-perlbrew:2

ARG PYENV_ROOT=/usr/local/python
ARG PYTHON_VERSION=3.6.3
ARG PYTHON2_VERSION=2.7.13
ARG PYTHON_VERSION=3.8.9
ARG PYTHON2_VERSION=2.7.18

ENV PYENV_ROOT $PYENV_ROOT

Expand All @@ -15,7 +11,7 @@ RUN bash -c 'curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/mas
ENV PATH $PYENV_ROOT/bin:$PATH
ENV PYTHON_VERSION $PYTHON_VERSION

RUN yum install -y readline readline-devel sqlite sqlite-devel openssl openssl-devel openssl-libs tk-devel xz xz-devel libffi-devel findutils lib-devel bzip2 bzip2-devel
RUN yum install -y readline readline-devel sqlite sqlite-devel openssl openssl-devel openssl-libs tk-devel xz xz-devel libffi-devel findutils zlib-devel bzip2 bzip2-devel

RUN pyenv install $PYTHON_VERSION
RUN pyenv install $PYTHON2_VERSION
Expand Down
9 changes: 2 additions & 7 deletions pyenv3-java/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
FROM biocorecrg/amazonlinux-perlbrew-pyenv3

# File Author / Maintainer
MAINTAINER Toni Hermoso Pulido <[email protected]>
MAINTAINER Luca Cozzuto <[email protected]>
FROM biocorecrg/amazonlinux-perlbrew-pyenv3:2

ARG JAVA_VERSION=1.8.0
ARG MAVEN_VERSION=3.3.9

ENV JAVA_HOME /usr/lib/jvm/java-openjdk
ENV JAVA_HOME=/usr/lib/jvm/java-openjdk

# Install Redis
RUN yum update -y
# Install Java
RUN yum install -y java-$JAVA_VERSION-openjdk java-$JAVA_VERSION-openjdk-devel
Expand Down
8 changes: 2 additions & 6 deletions pyenv3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
FROM biocorecrg/amazonlinux-perlbrew

# File Author / Maintainer
MAINTAINER Toni Hermoso Pulido <[email protected]>
MAINTAINER Luca Cozzuto <[email protected]>
FROM biocorecrg/amazonlinux-perlbrew:2

ARG PYENV_ROOT=/usr/local/python
ARG PYTHON_VERSION=3.8.9
Expand All @@ -14,7 +10,7 @@ RUN bash -c 'curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/mas
ENV PATH $PYENV_ROOT/bin:$PATH
ENV PYTHON_VERSION $PYTHON_VERSION

RUN yum install -y readline readline-devel sqlite sqlite-devel openssl openssl-devel openssl-libs tk-devel xz xz-devel libffi-devel findutils lib-devel bzip2 bzip2-devel
RUN yum install -y readline readline-devel sqlite sqlite-devel openssl openssl-devel openssl-libs tk-devel xz xz-devel libffi-devel findutils zlib-devel bzip2 bzip2-devel

RUN pyenv install $PYTHON_VERSION

Expand Down

0 comments on commit a368113

Please sign in to comment.