Skip to content

Commit 9b8d97e

Browse files
committed
Clean a few lines
1 parent 55e15b5 commit 9b8d97e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ COPY --from=ghcr.io/graalvm/native-image-community:17-ol9 /usr/lib64/graalvm/gra
2222
COPY --from=ghcr.io/graalvm/native-image-community:21-ol9 /usr/lib64/graalvm/graalvm-community-java21 /usr/lib/jvm/graalvm21
2323

2424
RUN apt-get update && \
25-
apt-get install -y curl tar apt-transport-https ca-certificates gnupg wget && \
25+
apt-get install -y curl tar apt-transport-https ca-certificates gnupg && \
2626
apt-get clean && \
2727
rm -rf /var/lib/apt/lists/*
2828

@@ -71,7 +71,7 @@ FROM ubuntu:24.04 AS base
7171
LABEL org.opencontainers.image.source=https://github.com/DataDog/dd-trace-java-docker-build
7272

7373
RUN apt-get update && \
74-
apt-get install -y curl apt-transport-https ca-certificates gnupg \
74+
apt-get install -y curl tar apt-transport-https ca-certificates gnupg \
7575
socat less debian-goodies autossh ca-certificates-java python3-pip && \
7676
apt-get clean && \
7777
rm -rf /var/lib/apt/lists/* && \
@@ -83,6 +83,8 @@ RUN <<-EOT
8383
dockerPluginDir=/usr/local/lib/docker/cli-plugins
8484
curl -sSL "https://github.com/docker/compose/releases/latest/download/docker-compose-linux-$(uname -m)" -o $dockerPluginDir/docker-compose
8585
chmod +x $dockerPluginDir/docker-compose
86+
update-alternatives --remove docker-compose /usr/local/bin/compose-switch
87+
rm -f /usr/local/bin/compose-switch
8688
curl -sSL "https://github.com/mikefarah/yq/releases/latest/download/yq_linux_$(dpkg --print-architecture).tar.gz" | tar -xz -C /usr/local/bin --wildcards --no-anchored 'yq_linux_*'
8789
YQ_PATH=$(find /usr/local/bin -name 'yq_linux_*')
8890
mv "$YQ_PATH" /usr/local/bin/yq

0 commit comments

Comments
 (0)