Skip to content

Commit

Permalink
Merge pull request #402 from riscv-boom/docker
Browse files Browse the repository at this point in the history
[ci] Add python3 to Docker image
  • Loading branch information
abejgonzalez committed Sep 28, 2019
2 parents 88fad17 + 36976e3 commit 2a0ea2e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .circleci/images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ RUN groupadd --gid 3434 riscvuser \
# docker run --rm openjdk:9-slim cat /etc/ssl/certs/java/cacerts | # aws s3 cp - s3://circle-downloads/circleci-images/cache/linux-amd64/openjdk-9-slim-cacerts --acl public-read
RUN if java -fullversion 2>&1 | grep -q '"9.'; then curl --silent --show-error --location --fail --retry 3 --output /etc/ssl/certs/java/cacerts https://circle-downloads.s3.amazonaws.com/circleci-images/cache/linux-amd64/openjdk-9-slim-cacerts; fi

# Install Maven Version: 3.6.0
RUN curl --silent --show-error --location --fail --retry 3 --output /tmp/apache-maven.tar.gz https://www.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz \
# Install Maven Version: 3.6.2
RUN curl --silent --show-error --location --fail --retry 3 --output /tmp/apache-maven.tar.gz https://www.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.tar.gz \
&& tar xf /tmp/apache-maven.tar.gz -C /opt/ \
&& rm /tmp/apache-maven.tar.gz \
&& ln -s /opt/apache-maven-* /opt/apache-maven \
Expand Down Expand Up @@ -149,6 +149,7 @@ RUN apt-get install -y \
pkg-config \
python \
python-pexpect \
python3 \
texinfo \
zlib1g-dev \
rsync
Expand Down

0 comments on commit 2a0ea2e

Please sign in to comment.