Skip to content

Commit 8774283

Browse files
authoredNov 3, 2024··
Merge pull request #24 from ii/qol-update-202410181012
chore: quality of life update
2 parents 70df366 + 2289a1a commit 8774283

File tree

1 file changed

+70
-67
lines changed

1 file changed

+70
-67
lines changed
 

‎build/Dockerfile

+70-67
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:mantic-20231128
1+
FROM ubuntu:noble-20241009
22

33
# install enough to setup apt repos
44
RUN DEBIAN_FRONTEND=noninteractive \
@@ -32,71 +32,74 @@ RUN DEBIAN_FRONTEND=noninteractive \
3232
# apt install packages
3333
RUN DEBIAN_FRONTEND=noninteractive \
3434
apt-get install --yes \
35-
tmux \
36-
tmate \
37-
bash-completion \
38-
less \
39-
git \
40-
xz-utils \
41-
sudo \
42-
vim \
43-
wget \
44-
emacs-pgtk \
45-
language-pack-en \
46-
openssh-client \
47-
postgresql-client \
48-
jq \
4935
apache2-utils \
50-
inotify-tools \
51-
xtermcontrol \
52-
tzdata \
53-
silversearcher-ag \
36+
asciinema \
37+
bash-completion \
38+
bsdmainutils \
39+
cmake \
40+
code \
41+
dbus-x11 \
42+
devscripts \
5443
direnv \
55-
rsync \
56-
lsof \
57-
htop \
44+
dnsutils \
45+
docker-ce \
46+
docker-ce-cli \
47+
containerd.io \
48+
docker-buildx-plugin \
49+
docker-compose-plugin \
50+
dpkg-dev \
51+
emacs-pgtk \
52+
fd-find \
5853
file \
59-
unzip \
60-
psmisc \
61-
iproute2 \
62-
tcpdump \
63-
rlwrap \
64-
fonts-powerline \
6554
flatpak-xdg-utils \
55+
fonts-powerline \
56+
gettext-base \
57+
git \
6658
google-cloud-sdk \
67-
bsdmainutils \
68-
awscli \
69-
python3-pip \
70-
dnsutils \
71-
net-tools \
72-
tree \
73-
iputils-ping \
59+
graphviz \
60+
htop \
61+
icewm \
7462
iftop \
75-
ripgrep \
76-
python-is-python3 \
77-
nodejs \
78-
pipenv \
79-
gettext-base \
63+
inotify-tools \
64+
iproute2 \
65+
iputils-ping \
66+
jq \
67+
kitty \
68+
language-pack-en \
69+
less \
70+
libjson-c-dev \
71+
libwebsockets-dev \
8072
locate \
81-
fd-find \
82-
graphviz \
73+
lsof \
74+
net-tools \
8375
netcat-openbsd \
84-
asciinema \
76+
nodejs \
77+
openjdk-17-jdk \
78+
openssh-client \
79+
pipenv \
80+
plasma-desktop \
81+
postgresql-client \
82+
psmisc \
83+
python-is-python3 \
84+
python3-pip \
85+
ripgrep \
86+
rlwrap \
87+
rsync \
88+
silversearcher-ag \
8589
ssh-import-id \
86-
docker-ce-cli \
90+
sudo \
91+
tcpdump \
8792
tigervnc-standalone-server \
88-
icewm \
89-
kitty \
90-
plasma-desktop \
91-
dbus-x11 \
93+
tmate \
94+
tmux \
95+
tree \
96+
tzdata \
97+
unzip \
98+
vim \
9299
websockify \
93-
code \
94-
cmake \
95-
dpkg-dev \
96-
devscripts \
97-
libwebsockets-dev \
98-
libjson-c-dev \
99-
openjdk-17-jdk \
100+
wget \
101+
xtermcontrol \
102+
xz-utils \
100103
&& ln -s /usr/bin/fdfind /usr/local/bin/fd \
101104
&& rm -rf /var/lib/apt/lists/*
102105
# firefox-esr \
@@ -114,7 +117,7 @@ RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
114117

115118
# Settings for GO and crictl
116119
ENV GOROOT=/usr/local/go \
117-
GO_VERSION=1.21.6 \
120+
GO_VERSION=1.23.2 \
118121
PATH="$PATH:/usr/local/go/bin:/usr/libexec/flatpak-xdg-utils:/home/ii/go/bin" \
119122
CONTAINERD_NAMESPACE=k8s.io
120123

@@ -126,15 +129,15 @@ RUN . /usr/local/lib/arch-helper.sh \
126129
&& curl -L https://dl.google.com/go/go${GO_VERSION}.linux-${ARCH_TYPE_2}.tar.gz \
127130
| tar --directory /usr/local --extract --ungzip
128131
# kind binary
129-
ENV KIND_VERSION=0.20.0
132+
ENV KIND_VERSION=0.24.0
130133
RUN . /usr/local/lib/arch-helper.sh \
131134
&& curl -Lo /usr/local/bin/kind \
132135
https://github.com/kubernetes-sigs/kind/releases/download/v${KIND_VERSION}/kind-linux-${ARCH_TYPE_2} \
133136
&& chmod +x /usr/local/bin/kind
134137
# kubectl binary
135-
ENV KUBECTL_VERSION=1.29.1
138+
ENV KUBECTL_VERSION=1.31.1
136139
RUN . /usr/local/lib/arch-helper.sh \
137-
&& curl -L https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/${ARCH_TYPE_2}/kubectl -o /usr/local/bin/kubectl \
140+
&& curl -L https://dl.k8s.io/v${KUBECTL_VERSION}/bin/linux/${ARCH_TYPE_2}/kubectl -o /usr/local/bin/kubectl \
138141
&& chmod +x /usr/local/bin/kubectl
139142
# tilt binary
140143
ENV TILT_VERSION=0.33.10
@@ -143,7 +146,7 @@ RUN . /usr/local/lib/arch-helper.sh \
143146
https://github.com/tilt-dev/tilt/releases/download/v${TILT_VERSION}/tilt.${TILT_VERSION}.linux.${ARCH_TYPE_1}.tar.gz \
144147
| tar --directory /usr/local/bin --extract --ungzip tilt
145148
# gh cli
146-
ENV GH_VERSION=2.42.1
149+
ENV GH_VERSION=2.58.0
147150
RUN . /usr/local/lib/arch-helper.sh \
148151
&& curl -sSL https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_${ARCH_TYPE_2}.tar.gz \
149152
| tar --directory /usr/local --extract --ungzip \
@@ -157,11 +160,11 @@ RUN . /usr/local/lib/arch-helper.sh \
157160
| tar --directory /usr/local/bin --extract --xz \
158161
--strip-components 1 tmate-${TMATE_VERSION}-static-linux-${ARCH_TYPE_3}/tmate
159162
# helm binary
160-
ENV HELM_VERSION=3.14.0
163+
ENV HELM_VERSION=3.16.2
161164
RUN . /usr/local/lib/arch-helper.sh \
162165
&& curl -L https://get.helm.sh/helm-v${HELM_VERSION}-linux-${ARCH_TYPE_2}.tar.gz | tar --directory /usr/local/bin --extract -xz --strip-components 1 linux-${ARCH_TYPE_2}/helm
163166
# talosctl
164-
ENV TALOSCTL_VERSION=1.6.1
167+
ENV TALOSCTL_VERSION=1.8.1
165168
RUN . /usr/local/lib/arch-helper.sh \
166169
&& curl -L -o /usr/local/bin/talosctl https://github.com/talos-systems/talos/releases/download/v${TALOSCTL_VERSION}/talosctl-linux-${ARCH_TYPE_2} && \
167170
chmod +x /usr/local/bin/talosctl
@@ -191,19 +194,19 @@ RUN curl -fsSL https://raw.githubusercontent.com/technomancy/leiningen/${LEIN_VE
191194
-o /usr/local/bin/lein \
192195
&& chmod +x /usr/local/bin/lein \
193196
&& lein version
194-
ENV KN_CLIENT_VERSION=1.11.2
197+
ENV KN_CLIENT_VERSION=1.15.0
195198
RUN . /usr/local/lib/arch-helper.sh \
196199
&& curl -L https://github.com/knative/client/releases/download/knative-v${KN_CLIENT_VERSION}/kn-linux-${ARCH_TYPE_2} -o /usr/local/bin/kn \
197200
&& chmod +x /usr/local/bin/kn
198-
ENV DIVE_VERSION=0.11.0
201+
ENV DIVE_VERSION=0.12.0
199202
RUN . /usr/local/lib/arch-helper.sh \
200203
&& curl -L https://github.com/wagoodman/dive/releases/download/v${DIVE_VERSION}/dive_${DIVE_VERSION}_linux_${ARCH_TYPE_2}.tar.gz | tar --directory /usr/local/bin --extract --ungzip dive
201204
ENV UPTERM_VERSION=0.13.0
202205
RUN . /usr/local/lib/arch-helper.sh \
203206
&& curl -L https://github.com/owenthereal/upterm/releases/download/v${UPTERM_VERSION}/upterm_linux_${ARCH_TYPE_2}.tar.gz | tar --directory /usr/local/bin --extract --ungzip upterm
204207
ENV METALCLI_VERSION=0.19.0 \
205-
KO_VERSION=0.15.1 \
206-
GOPLS_VERSION=0.12.2
208+
KO_VERSION=0.16.0 \
209+
GOPLS_VERSION=0.16.2
207210
# GOPLS_VERSION=0.10.0 # Also a big jump... 0.13.0 is just around the corner
208211
RUN set -x \
209212
&& /bin/env GO111MODULE=on GOPATH=/usr/local/go /usr/local/go/bin/go install golang.org/x/tools/gopls@v$GOPLS_VERSION \
@@ -292,7 +295,7 @@ RUN ln -sf /usr/bin/firefox-esr /usr/bin/firefox
292295
# create ii user
293296
ARG USER=ii
294297
ENV LANG=en_US.utf8
295-
RUN useradd --groups sudo --no-create-home --shell /bin/bash ${USER} \
298+
RUN useradd --groups sudo,docker --no-create-home --shell /bin/bash ${USER} \
296299
&& echo "${USER} ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/${USER} \
297300
&& chmod 0440 /etc/sudoers.d/${USER}
298301

0 commit comments

Comments
 (0)