Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump base image to ubuntu:22.04 #30

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bump base image to ubuntu:22.04 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions package/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:22.04
RUN sed -i 's:^path-exclude=/usr/share/man:#path-exclude=/usr/share/man:' /etc/dpkg/dpkg.cfg.d/excludes
RUN apt-get update && \
export DEBIAN_FRONTEND=noninteractive && \
Expand All @@ -14,7 +14,6 @@ RUN apt-get update && \
iperf \
iperf3 \
iproute2 \
ipsec-tools \
ipset \
iptables \
iputils-ping \
Expand Down Expand Up @@ -43,7 +42,6 @@ RUN apt-get update && \
vim \
wget && \
rm -rf /var/lib/apt/lists/* && \
mv /usr/sbin/tcpdump /usr/bin/tcpdump && \
mv /usr/sbin/traceroute /usr/bin/traceroute && \
curl -sLf https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 > /usr/bin/docker && \
chmod +x /usr/bin/docker && \
Expand Down
4 changes: 3 additions & 1 deletion scripts/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/sh

set -x

# version.env file needs to be generated and sourced in
# downstream steps as some of the images don't have git
# and other necessary commands available
Expand Down Expand Up @@ -36,4 +38,4 @@ export VERSION=${VERSION}
export IMAGE_VERSION=${IMAGE_VERSION}
export ARCH=${ARCH}
EOT
echo "Generated version.env"
echo "Generated version.env"