Skip to content

Commit 9a46bfe

Browse files
committed
5467 Use Ubuntu in other Docker images
1 parent c073fe4 commit 9a46bfe

File tree

3 files changed

+39
-3
lines changed
  • java

3 files changed

+39
-3
lines changed

java/bulk-export/bulk-export-task-execution/docker/Dockerfile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,19 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
FROM amazoncorretto:17-al2023-headless
14+
FROM ubuntu:24.04
15+
16+
# Install Amazon Corretto JDK
17+
RUN apt-get update && apt-get install -y \
18+
ca-certificates \
19+
curl \
20+
gnupg
21+
RUN curl -fsSL https://apt.corretto.aws/corretto.key | gpg --dearmor --yes -o /etc/apt/keyrings/corretto-keyring.gpg
22+
RUN echo "deb [signed-by=/etc/apt/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" \
23+
| tee /etc/apt/sources.list.d/corretto.list > /dev/null
24+
RUN apt-get update && apt-get install -y \
25+
java-17-amazon-corretto-jdk \
26+
&& rm -rf /var/lib/apt/lists/*
1527

1628
COPY bulk-export-task-execution.jar /bulk-export-task-execution.jar
1729
COPY run.sh /run.sh

java/ingest/ingest-runner/docker/Dockerfile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,19 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
FROM amazoncorretto:17-al2023-headless
14+
FROM ubuntu:24.04
15+
16+
# Install Amazon Corretto JDK
17+
RUN apt-get update && apt-get install -y \
18+
ca-certificates \
19+
curl \
20+
gnupg
21+
RUN curl -fsSL https://apt.corretto.aws/corretto.key | gpg --dearmor --yes -o /etc/apt/keyrings/corretto-keyring.gpg
22+
RUN echo "deb [signed-by=/etc/apt/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" \
23+
| tee /etc/apt/sources.list.d/corretto.list > /dev/null
24+
RUN apt-get update && apt-get install -y \
25+
java-17-amazon-corretto-jdk \
26+
&& rm -rf /var/lib/apt/lists/*
1527

1628
COPY ingest.jar /ingest.jar
1729
COPY run.sh /run.sh

java/system-test/system-test-data-generation/docker/Dockerfile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,19 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
FROM amazoncorretto:17-al2023-headless
14+
FROM ubuntu:24.04
15+
16+
# Install Amazon Corretto JDK
17+
RUN apt-get update && apt-get install -y \
18+
ca-certificates \
19+
curl \
20+
gnupg
21+
RUN curl -fsSL https://apt.corretto.aws/corretto.key | gpg --dearmor --yes -o /etc/apt/keyrings/corretto-keyring.gpg
22+
RUN echo "deb [signed-by=/etc/apt/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" \
23+
| tee /etc/apt/sources.list.d/corretto.list > /dev/null
24+
RUN apt-get update && apt-get install -y \
25+
java-17-amazon-corretto-jdk \
26+
&& rm -rf /var/lib/apt/lists/*
1527

1628
COPY system-test.jar /system-test.jar
1729
COPY run.sh /run.sh

0 commit comments

Comments
 (0)