Skip to content
This repository has been archived by the owner on Apr 8, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1417 from jenkins-x-bot/bump-docker-version-8d6c3…
Browse files Browse the repository at this point in the history
…69c-4607-4a0f-ad67-52fead4e2ece

chore(deps): bump https://github.com/jenkins-x/jenkins-x-builders-base from 0.0.83 to 0.0.86
  • Loading branch information
jenkins-x-bot authored Dec 24, 2020
2 parents 6ec1a4a + 885cdd0 commit 77173fe
Show file tree
Hide file tree
Showing 36 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.gobase
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN curl -f -o /etc/yum.repos.d/vbatts-bazel-epel-7.repo https://copr.fedorainfracloud.org/coprs/vbatts/bazel/repo/epel-7/vbatts-bazel-epel-7.repo \
&& yum install -y bazel \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.mavenbase
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

# Maven
ENV MAVEN_VERSION 3.6.3
Expand Down
2 changes: 1 addition & 1 deletion builder-asciidoctor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

# asciidoctor

Expand Down
2 changes: 1 addition & 1 deletion builder-cf/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN yum-config-manager --add-repo https://packages.cloudfoundry.org/fedora/cloudfoundry-cli.repo \
&& yum install -y cf-cli \
Expand Down
2 changes: 1 addition & 1 deletion builder-dlang/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

ENV \
DMD_PATH=/opt/dlang
Expand Down
2 changes: 1 addition & 1 deletion builder-dotnet/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm \
&& yum -y update \
Expand Down
2 changes: 1 addition & 1 deletion builder-gradle/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

CMD ["gradle"]

Expand Down
2 changes: 1 addition & 1 deletion builder-gradle4/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

CMD ["gradle"]

Expand Down
2 changes: 1 addition & 1 deletion builder-gradle5-java11/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

CMD ["gradle"]

Expand Down
2 changes: 1 addition & 1 deletion builder-gradle5/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

CMD ["gradle"]

Expand Down
2 changes: 1 addition & 1 deletion builder-jx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

# jx
ENV JX_VERSION 2.1.155
Expand Down
2 changes: 1 addition & 1 deletion builder-machine-learning-gpu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

# CUDA 10.0
RUN echo $'[cudarepo]\n\
Expand Down
2 changes: 1 addition & 1 deletion builder-machine-learning/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

ENV ANACONDAVERSION 3-2019.03
RUN curl -fLo anaconda.sh https://repo.anaconda.com/archive/Anaconda${ANACONDAVERSION}-Linux-x86_64.sh && \
Expand Down
2 changes: 1 addition & 1 deletion builder-maven-32/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN yum install -y java-1.8.0-openjdk-devel.i686 && yum clean all

Expand Down
2 changes: 1 addition & 1 deletion builder-maven-graalvm-java11/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN yum install -y java-11-openjdk-devel && yum update -y && yum clean all

Expand Down
2 changes: 1 addition & 1 deletion builder-maven-graalvm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

# Maven
ENV MAVEN_VERSION 3.6.3
Expand Down
2 changes: 1 addition & 1 deletion builder-maven-java14/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN curl -O https://download.java.net/java/GA/jdk14.0.1/664493ef4a6946b186ff29eb326336a2/7/GPL/openjdk-14.0.1_linux-x64_bin.tar.gz
RUN tar xvf openjdk-14.0.1_linux-x64_bin.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion builder-maven/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN yum install -y java-1.8.0-openjdk-devel && yum clean all

Expand Down
2 changes: 1 addition & 1 deletion builder-newman/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN curl -f --silent --location https://rpm.nodesource.com/setup_10.x | bash - && \
yum install -y nodejs && \
Expand Down
2 changes: 1 addition & 1 deletion builder-nodejs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN yum install -y gcc-c++ make bzip2 GConf2 gtk2 chromedriver chromium xorg-x11-server-Xvfb && \
curl -f --silent --location https://rpm.nodesource.com/setup_11.x | bash - && \
Expand Down
2 changes: 1 addition & 1 deletion builder-nodejs10x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN curl -f --silent --location https://rpm.nodesource.com/setup_10.x | bash - && \
yum install -y nodejs && \
Expand Down
2 changes: 1 addition & 1 deletion builder-nodejs12x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN curl -f --silent --location https://rpm.nodesource.com/setup_12.x | bash - && \
yum install -y nodejs && \
Expand Down
2 changes: 1 addition & 1 deletion builder-nodejs14x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN curl -f --silent --location https://rpm.nodesource.com/setup_14.x | bash - && \
yum install -y nodejs && \
Expand Down
2 changes: 1 addition & 1 deletion builder-nodejs8x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN yum install -y gcc-c++ make bzip2 GConf2 gtk2 chromedriver chromium xorg-x11-server-Xvfb && \
curl -f --silent --location https://rpm.nodesource.com/setup_8.x | bash - && \
Expand Down
2 changes: 1 addition & 1 deletion builder-php5x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN yum install -y http://rpms.remirepo.net/enterprise/remi-release-7.rpm && \
yum install -y yum-utils && \
Expand Down
2 changes: 1 addition & 1 deletion builder-php7x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN yum install -y http://rpms.remirepo.net/enterprise/remi-release-7.rpm && \
yum install -y yum-utils && \
Expand Down
2 changes: 1 addition & 1 deletion builder-python/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN yum install -y https://repo.ius.io/ius-release-el7.rpm && \
yum install -y python36u python36u-libs python36u-devel python36u-pip && yum clean all && \
Expand Down
2 changes: 1 addition & 1 deletion builder-python2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN yum install -y python python-libs python-devel python-pip && yum clean all

Expand Down
2 changes: 1 addition & 1 deletion builder-python37/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

ENV PYTHONVERSION 3.7.1

Expand Down
2 changes: 1 addition & 1 deletion builder-ruby/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-rubybase:0.0.83
FROM gcr.io/jenkinsxio/builder-rubybase:0.0.86

# jx
ENV JX_VERSION 2.1.155
Expand Down
2 changes: 1 addition & 1 deletion builder-rust/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

ENV PATH=$PATH:/root/.cargo/bin

Expand Down
2 changes: 1 addition & 1 deletion builder-scala/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-base:0.0.83
FROM gcr.io/jenkinsxio/builder-base:0.0.86

RUN yum install -y java-1.8.0-openjdk-devel && \
yum -y groupinstall 'Development Tools' && \
Expand Down
2 changes: 1 addition & 1 deletion builder-swift/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/jenkinsxio/builder-swiftbase:0.0.83
FROM gcr.io/jenkinsxio/builder-swiftbase:0.0.86

# jx
ENV JX_VERSION 2.1.155
Expand Down
2 changes: 1 addition & 1 deletion dependency-matrix/matrix.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
Dependency | Sources | Version | Mismatched versions
---------- | ------- | ------- | -------------------
[jenkins-x/jx](https://github.com/jenkins-x/jx) | | [2.1.155](https://github.com/jenkins-x/jx/releases/tag/v2.1.155) |
[jenkins-x/jenkins-x-builders-base](https://github.com/jenkins-x/jenkins-x-builders-base) | | [0.0.83](https://github.com/jenkins-x/jenkins-x-builders-base/releases/tag/v0.0.83) |
[jenkins-x/jenkins-x-builders-base](https://github.com/jenkins-x/jenkins-x-builders-base) | | [0.0.86](https://github.com/jenkins-x/jenkins-x-builders-base/releases/tag/v0.0.86) |
[jenkins-x/jenkins-x-builders-base-image](https://github.com/jenkins-x/jenkins-x-builders-base-image) | [github.com/jenkins-x/jenkins-x-builders-base](https://github.com/jenkins-x/jenkins-x-builders-base) | [0.0.36]() |
4 changes: 2 additions & 2 deletions dependency-matrix/matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ dependencies:
owner: jenkins-x
repo: jenkins-x-builders-base
url: https://github.com/jenkins-x/jenkins-x-builders-base
version: 0.0.83
versionURL: https://github.com/jenkins-x/jenkins-x-builders-base/releases/tag/v0.0.83
version: 0.0.86
versionURL: https://github.com/jenkins-x/jenkins-x-builders-base/releases/tag/v0.0.86
- host: github.com
owner: jenkins-x
repo: jenkins-x-builders-base-image
Expand Down
20 changes: 10 additions & 10 deletions jenkins-x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ pipelineConfig:
command: /kaniko/warmer
args:
- --cache-dir=/workspace
- --image=gcr.io/jenkinsxio/builder-base:0.0.83
- --image=gcr.io/jenkinsxio/builder-base:0.0.86

# builders
- name: build-and-push-maven-java11
Expand Down Expand Up @@ -141,7 +141,7 @@ pipelineConfig:
command: /kaniko/warmer
args:
- --cache-dir=/workspace
- --image=gcr.io/jenkinsxio/builder-base:0.0.83
- --image=gcr.io/jenkinsxio/builder-base:0.0.86
- name: build-and-push-go-maven
command: /kaniko/executor
args:
Expand Down Expand Up @@ -207,7 +207,7 @@ pipelineConfig:
command: /kaniko/warmer
args:
- --cache-dir=/workspace
- --image=gcr.io/jenkinsxio/builder-base:0.0.83
- --image=gcr.io/jenkinsxio/builder-base:0.0.86
- name: build-and-push-gradle
command: /kaniko/executor
args:
Expand Down Expand Up @@ -282,9 +282,9 @@ pipelineConfig:
command: /kaniko/warmer
args:
- --cache-dir=/workspace
- --image=gcr.io/jenkinsxio/builder-swiftbase:0.0.83
- --image=gcr.io/jenkinsxio/builder-base:0.0.83
- --image=gcr.io/jenkinsxio/builder-rubybase:0.0.83
- --image=gcr.io/jenkinsxio/builder-swiftbase:0.0.86
- --image=gcr.io/jenkinsxio/builder-base:0.0.86
- --image=gcr.io/jenkinsxio/builder-rubybase:0.0.86
- name: build-and-push-jx
command: /kaniko/executor
args:
Expand Down Expand Up @@ -359,7 +359,7 @@ pipelineConfig:
command: /kaniko/warmer
args:
- --cache-dir=/workspace
- --image=gcr.io/jenkinsxio/builder-base:0.0.83
- --image=gcr.io/jenkinsxio/builder-base:0.0.86
- name: build-and-push-python37
command: /kaniko/executor
args:
Expand Down Expand Up @@ -475,9 +475,9 @@ pipelineConfig:
command: /kaniko/warmer
args:
- --cache-dir=/workspace
- --image=gcr.io/jenkinsxio/builder-swiftbase:0.0.83
- --image=gcr.io/jenkinsxio/builder-base:0.0.83
- --image=gcr.io/jenkinsxio/builder-rubybase:0.0.83
- --image=gcr.io/jenkinsxio/builder-swiftbase:0.0.86
- --image=gcr.io/jenkinsxio/builder-base:0.0.86
- --image=gcr.io/jenkinsxio/builder-rubybase:0.0.86

- name: build-and-push-jx2
command: /kaniko/executor
Expand Down

0 comments on commit 77173fe

Please sign in to comment.