Skip to content

Commit 0dd80f0

Browse files
authored
feat: update test image to ol9 (#877)
* feat: update test image to ol9 * use microdnf * use docker-ce * setup docker-ce repo * update hashicorp repo * update base image * add comment * add comment * update graalvm b image * restore graalvm-b test image
1 parent ca0443f commit 0dd80f0

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

.cloudbuild/docker-ce.repo

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[docker-ce-stable]
2+
name=Docker CE Stable - $basearch
3+
baseurl=https://download.docker.com/linux/rhel/$releasever/$basearch/stable
4+
enabled=1
5+
gpgcheck=1
6+
gpgkey=https://download.docker.com/linux/rhel/gpg

.cloudbuild/graalvm-a.Dockerfile

+10-7
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM ghcr.io/graalvm/graalvm-community:21.0.2-ol7-20240116
15+
FROM ghcr.io/graalvm/graalvm-community:21.0.2-ol9-20240116
1616

17-
RUN yum update -y && \
18-
yum install -y wget unzip git && \
17+
# use microdnf, see https://github.com/graalvm/container/issues/10
18+
RUN microdnf update -y oraclelinux-release-el9 && \
19+
microdnf install -y wget unzip git && \
1920
# Install maven
2021
wget -q https://archive.apache.org/dist/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.zip -O /tmp/maven.zip && \
2122
unzip /tmp/maven.zip -d /tmp/maven && \
@@ -27,20 +28,22 @@ ENV PATH $PATH:/usr/local/lib/maven/bin
2728

2829
# Install gcloud SDK
2930
COPY google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo
30-
RUN yum install -y google-cloud-sdk
31+
RUN microdnf install -y google-cloud-sdk
3132

3233
# Adding the package path to local
3334
ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin
3435

3536
# Install docker
36-
RUN yum install -y docker-engine docker-cli
37+
# See also https://docs.docker.com/engine/install/rhel/#set-up-the-repository
38+
COPY docker-ce.repo /etc/yum.repos.d/docker-ce.repo
39+
RUN microdnf install -y docker-ce docker-ce-cli
3740

3841
# Install terraform
3942
# See also https://www.hashicorp.com/official-packaging-guide
4043
COPY hashicorp.repo /etc/yum.repos.d/hashicorp.repo
41-
RUN yum -y install terraform
44+
RUN microdnf -y install terraform
4245

4346
# Install jq
44-
RUN yum -y install jq
47+
RUN microdnf -y install jq
4548

4649
WORKDIR /workspace

0 commit comments

Comments
 (0)