Skip to content

Commit 85f218a

Browse files
wabscalewabscale
committed
FIX versions
1 parent 564ba81 commit 85f218a

6 files changed

Lines changed: 32 additions & 33 deletions

File tree

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ export GIT_TAG
44

55
# Theia IDES
66
THEIA_BASE_IDE := \
7-
theia-base-38 theia-base-39 theia-base-310 theia-base-311
7+
theia-base-310 theia-base-311 theia-base-312 theia-base-313
88

99
THEIA_IDES := \
1010
theia-cpp theia-procdesign theia-admin theia-golang \
11-
theia-flask-39 theia-flask-310 \
12-
theia-mysql-39 theia-mysql-310 \
11+
theia-flask-310 \
12+
theia-mysql-310 \
1313
theia-devops theia-osiris theia-pincer
1414

1515
WEBTOP_BASE_IDES := \

‎theia-base/Dockerfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# https://github.com/theia-ide/theia-apps/tree/master/theia-cpp-docker
22

3-
FROM debian:trixie-slim as base
3+
FROM debian:trixie-slim AS base
44

55
ARG USER=anubis
6-
ARG DIST=bullseye
6+
ARG DIST=trixie
77
ARG PY_VERSION=3.13.7
88

99
ENV PY_VERSION=$PY_VERSION \
@@ -42,8 +42,8 @@ RUN set -ex; \
4242
apt-utils pkg-config curl lsb-release autoconf; \
4343
\
4444
`# Add LLVM to apt` \
45-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -; \
46-
echo "deb http://apt.llvm.org/${DIST}/ llvm-toolchain-${DIST} main" \
45+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-keyring.gpg; \
46+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/llvm-keyring.gpg] http://apt.llvm.org/${DIST}/ llvm-toolchain-${DIST} main" \
4747
> /etc/apt/sources.list.d/llvm.list; \
4848
\
4949
`# Add Docker to apt` \
@@ -60,7 +60,7 @@ RUN set -ex; \
6060
\
6161
apt-get update; \
6262
apt-get install -y --no-install-recommends \
63-
git curl wget build-essential tree clangd zsh exa locales zip unzip \
63+
git curl wget build-essential tree clangd zsh eza locales zip unzip \
6464
libffi-dev libexpat1-dev \
6565
libgdbm-dev liblzma-dev zlib1g-dev \
6666
libsqlite3-dev libssl-dev openssl \
@@ -88,7 +88,6 @@ RUN set -ex; \
8888
--enable-option-checking=fatal \
8989
--enable-shared \
9090
--with-system-expat \
91-
--with-system-ffi \
9291
--without-ensurepip; \
9392
make -j $(nproc) LDFLAGS="-Wl,--strip-all"; \
9493
make install; \
@@ -138,7 +137,7 @@ RUN set -ex; \
138137
chown anubis:anubis /log
139138

140139
# Build Theia Application
141-
ARG CODE_SERVER_VERSION=4.20.0
140+
ARG CODE_SERVER_VERSION=4.103.2
142141
ARG CODE_SERVER_INDEX=/usr/lib/code-server/lib/vscode/out/vs/code/browser/workbench/workbench.html
143142
COPY config.yml /etc/anubis/config.yml
144143
COPY settings.json /opt/code-server/User/settings.json
@@ -153,20 +152,21 @@ RUN set -ex; \
153152
\
154153
`# Disable insecure warning`; \
155154
sed -i 's/window.isSecureContext||/false&&/' \
156-
/usr/lib/code-server/lib/vscode/out/vs/workbench/workbench.web.main.js; \
155+
/usr/lib/code-server/lib/vscode/out/vs/code/browser/workbench/workbench.js; \
157156
\
158157
`# Enable fontawesome css in CSP` \
159158
sed -i "s/style-src 'self' 'unsafe-inline'/style-src 'self' 'unsafe-inline' https:\/\/use.fontawesome.com/" \
160-
/usr/lib/code-server/lib/vscode/out/vs/server/node/server.main.js; \
159+
/usr/lib/code-server/lib/vscode/out/server-main.js \
160+
/usr/lib/code-server/lib/vscode/out/vs/code/browser/workbench/workbench.js; \
161161
\
162162
`# Insert heartbeat script`; \
163163
SCRIPT_LINE='<script>function ping(){if (document.hasFocus()){fetch("/ide/ping")}};document.addEventListener("focus",ping);setInterval(ping,60000)</script>'; \
164164
HEAD_LINE_NUMBER=$(grep -n '</head>' ${CODE_SERVER_INDEX} | cut -f1 -d:); \
165165
sed -i "${HEAD_LINE_NUMBER}i${SCRIPT_LINE}" ${CODE_SERVER_INDEX}; \
166166
\
167167
`# Disable the insanely annoying bash shell integration`; \
168-
sed -i '1ireturn' /usr/lib/code-server/lib/vscode/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh; \
169-
sed -i '1isource ~/.bashrc' /usr/lib/code-server/lib/vscode/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh; \
168+
sed -i '1ireturn' /usr/lib/code-server/lib/vscode/out/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh; \
169+
sed -i '1isource ~/.bashrc' /usr/lib/code-server/lib/vscode/out/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh; \
170170
\
171171
`# Install Extensions`; \
172172
code-server --user-data-dir=/opt/code-server --install-extension ms-python.python; \
@@ -250,7 +250,7 @@ RUN set -eux; \
250250
COPY motd.txt /etc/motd
251251
COPY docker-entrypoint.sh supervisord.conf initialize-ide.py /
252252

253-
ENV K9S_VERSION=v0.32.3 MINIKUBE_HOME=/minikube
253+
ENV K9S_VERSION=v0.50.9 MINIKUBE_HOME=/minikube
254254

255255
RUN set -eux; \
256256
\

‎theia-cpp/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# https://github.com/theia-ide/theia-apps/tree/master/theia-cpp-docker
22

3-
FROM node:18 as vsix
3+
FROM node:24 as vsix
44

55
SHELL ["/bin/bash", "-c"]
66

@@ -26,7 +26,7 @@ RUN set -ex; \
2626
apt-get install -y --no-install-recommends \
2727
git make cmake strace \
2828
gcc-multilib g++-multilib libc6-dev \
29-
clangd clang-format qemu-system-i386 libgmp-dev libexpat-dev \
29+
clangd clang-format qemu-system-i386 libgmp-dev libmpfr-dev libexpat-dev \
3030
nasm spim bison flex \
3131
libgmp-dev libmpfr-dev; \
3232
cd /; \
@@ -42,7 +42,7 @@ RUN set -ex; \
4242
tar xJf gdb-${GDB_VERSION}.tar.xz; \
4343
rm gdb-${GDB_VERSION}.tar.xz; \
4444
cd gdb-${GDB_VERSION}; \
45-
./configure --with-python=python3.10 --prefix=/usr/ --with-expat; \
45+
./configure --with-python=python3.13 --prefix=/usr/ --with-expat; \
4646
make -j $(nproc); \
4747
make install; \
4848
cd ..; \

‎theia-osiris/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# https://github.com/theia-ide/theia-apps/tree/master/theia-cpp-docker
22

3-
ARG PY_VERSION=3.10
3+
ARG PY_VERSION=3.13
44
ARG BASE_IMAGE=registry.digitalocean.com/anubis/theia-base:python-${PY_VERSION}
55

6-
FROM node:18 as vsix
6+
FROM node:24 as vsix
77

88
SHELL ["/bin/bash", "-c"]
99

@@ -22,7 +22,7 @@ ARG USER=anubis
2222
ARG WEBTOP=OFF
2323

2424
ARG USER=anubis
25-
ARG GDB_VERSION=13.2
25+
ARG GDB_VERSION=16.3
2626

2727
COPY --from=vsix /webfreak-debug.vsix /opt/code-server/webfreak-debug.vsix
2828
COPY idafree.desktop /usr/share/applications/idafree.desktop
@@ -32,7 +32,7 @@ RUN set -ex; \
3232
apt-get install -y --no-install-recommends \
3333
git make cmake strace \
3434
gcc-multilib g++-multilib libc6-dev \
35-
clangd clang-format qemu-system-i386 libgmp-dev libexpat-dev \
35+
clangd clang-format qemu-system-i386 libgmp-dev libmpfr-dev libexpat-dev \
3636
nasm spim bison flex aircrack-ng airgraph-ng \
3737
netcat-traditional; \
3838
cd /; \
@@ -50,7 +50,7 @@ RUN set -ex; \
5050
tar xJf gdb-${GDB_VERSION}.tar.xz; \
5151
rm gdb-${GDB_VERSION}.tar.xz; \
5252
cd gdb-${GDB_VERSION}; \
53-
./configure --with-python=python3.10 --prefix=/usr/ --with-expat; \
53+
./configure --with-python=python3.13 --prefix=/usr/ --with-expat; \
5454
make -j $(nproc); \
5555
make install; \
5656
cd ..; \

‎theia-pincer/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# https://github.com/theia-ide/theia-apps/tree/master/theia-cpp-docker
22

3-
FROM node:18 as code-debug-visx
3+
FROM node:24 as code-debug-visx
44

55
SHELL ["/bin/bash", "-c"]
66

@@ -16,7 +16,7 @@ RUN set -eux; \
1616
FROM registry.digitalocean.com/anubis/theia-base:python-3.13 as theia
1717

1818
ARG USER=anubis
19-
ARG GDB_VERSION=13.2
19+
ARG GDB_VERSION=16.3
2020

2121
COPY --from=code-debug-visx /webfreak-debug.vsix /opt/code-server/webfreak-debug.vsix
2222

@@ -28,7 +28,7 @@ RUN set -ex; \
2828
apt-get install -y --no-install-recommends \
2929
git make cmake strace \
3030
gcc-multilib g++-multilib libc6-dev \
31-
clangd clang-format qemu-system-i386 libgmp-dev libexpat-dev \
31+
clangd clang-format qemu-system-i386 libgmp-dev libmpfr-dev libexpat-dev \
3232
nasm ninja-build; \
3333
cd /; \
3434
\
@@ -44,7 +44,7 @@ RUN set -ex; \
4444
tar xJf gdb-${GDB_VERSION}.tar.xz; \
4545
rm gdb-${GDB_VERSION}.tar.xz; \
4646
cd gdb-${GDB_VERSION}; \
47-
./configure --with-python=python3.10 --prefix=/usr/ --with-expat; \
47+
./configure --with-python=python3.13 --prefix=/usr/ --with-expat; \
4848
make -j $(nproc); \
4949
make install; \
5050
cd ..; \

‎theia-procdesign/Dockerfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# https://github.com/theia-ide/theia-apps/tree/master/theia-cpp-docker
22

3-
FROM node:18 as vsix
3+
FROM node:24 as vsix
44

55
SHELL ["/bin/bash", "-c"]
66

@@ -16,20 +16,19 @@ RUN set -eux; \
1616
FROM registry.digitalocean.com/anubis/theia-base:python-3.13 as theia
1717

1818
ARG USER=anubis
19-
ARG GDB_VERSION=13.2
19+
ARG GDB_VERSION=16.3
2020

2121
COPY --from=vsix /webfreak-debug.vsix /opt/code-server/webfreak-debug.vsix
2222

2323
USER root
2424
RUN set -ex; \
25-
echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list; \
2625
apt-get update; \
2726
apt-get install -y --no-install-recommends \
2827
git make strace \
2928
gcc-multilib g++-multilib libc6-dev \
30-
clangd clang-format qemu-system-i386 libgmp-dev libexpat-dev \
29+
clangd clang-format qemu-system-i386 libgmp-dev libmpfr-dev libexpat-dev \
3130
nasm verilator ninja-build; \
32-
apt-get install -y --no-install-recommends cmake/bullseye-backports; \
31+
apt-get install -y --no-install-recommends cmake; \
3332
cd /; \
3433
\
3534
`# Install extensions` \
@@ -43,7 +42,7 @@ RUN set -ex; \
4342
tar xJf gdb-${GDB_VERSION}.tar.xz; \
4443
rm gdb-${GDB_VERSION}.tar.xz; \
4544
cd gdb-${GDB_VERSION}; \
46-
./configure --with-python=python3.10 --prefix=/usr/ --with-expat; \
45+
./configure --with-python=python3.13 --prefix=/usr/ --with-expat; \
4746
make -j $(nproc); \
4847
make install; \
4948
cd ..; \

0 commit comments

Comments
 (0)