From 6aff4efac8242324c83c9513d3c933249fb9a730 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 7 May 2023 09:35:33 +0200
Subject: [PATCH] Add docker for fedora 39 linux distribution

---
 buildkite/docker/fedora39/Dockerfile | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/buildkite/docker/fedora39/Dockerfile b/buildkite/docker/fedora39/Dockerfile
index 82d7f54194..4bacccd217 100644
--- a/buildkite/docker/fedora39/Dockerfile
+++ b/buildkite/docker/fedora39/Dockerfile
@@ -1,9 +1,20 @@
+<<<<<<< HEAD
 FROM fedora:39 as fedora39-bazel-java17
 ARG BUILDARCH
 
 RUN dnf update -y
 
 ### Install packages required by Bazel and its tests
+=======
+FROM fedora:39
+ARG BUILDARCH
+
+# Install required packages.
+COPY google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo
+
+RUN dnf update -y
+
+>>>>>>> c2a8200f (Add docker for fedora 39 linux distribution)
 RUN dnf install -y \
   bind-utils \
   dnsutils \
@@ -15,6 +26,10 @@ RUN dnf install -y \
   git \
   glibc-langpack-en \
   glibc-locale-source \
+<<<<<<< HEAD
+=======
+  google-cloud-sdk \
+>>>>>>> c2a8200f (Add docker for fedora 39 linux distribution)
   iproute \
   iputils \
   lcov \
@@ -38,13 +53,17 @@ RUN dnf install -y \
   && dnf clean all \
   && rm -rf /var/cache/yum
 
+<<<<<<< HEAD
 RUN localedef -i en_US -f ISO-8859-1 en_US.ISO-8859-1
 
+=======
+>>>>>>> c2a8200f (Add docker for fedora 39 linux distribution)
 # Allow using sudo inside the container.
 RUN echo "ALL ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk
 
+<<<<<<< HEAD
 FROM fedora39-bazel-java17 AS fedora39-java17
 
 # Install Google Cloud SDK
@@ -52,6 +71,9 @@ COPY google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo
 
 RUN dnf install -y \
   google-cloud-sdk
+=======
+RUN localedef -i en_US -f ISO-8859-1 en_US.ISO-8859-1
+>>>>>>> c2a8200f (Add docker for fedora 39 linux distribution)
 
 # Bazelisk
 RUN LATEST_BAZELISK=$(curl -sSI https://github.com/bazelbuild/bazelisk/releases/latest | grep -i '^location: ' | sed 's|.*/||' | sed $'s/\r//') && \