Skip to content

Commit aa961c5

Browse files
authored
FIX minor issues fall21 (#236)
* CHG rename admin registry token name * CHG tune api startup probe * FIX -lgcc issue on xv6 ide * FIX build issue with latest theia * FIX rename pipeline url in template
1 parent 21d3210 commit aa961c5

File tree

9 files changed

+18
-26
lines changed

9 files changed

+18
-26
lines changed

api/anubis/utils/k8s/theia.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def create_theia_k8s_pod_pvc(theia_session: TheiaSession) -> Tuple[client.V1Pod,
150150
name='docker-config',
151151
secret=client.V1SecretVolumeSource(
152152
default_mode=0o644,
153-
secret_name="anubis",
153+
secret_name="anubis-registry",
154154
items=[
155155
client.V1KeyToPath(
156156
key=".dockerconfigjson",

k8s/chart/templates/api.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ spec:
105105
httpGet:
106106
path: /
107107
port: 5000
108-
initialDelaySeconds: 1
108+
initialDelaySeconds: 3
109109
periodSeconds: 1
110110
failureThreshold: 60
111111
livenessProbe:

theia/ide/admin/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ RUN adduser --disabled-password --gecos '' --uid 1001 anubis; \
113113
&& rm -rf /var/cache/apt/* \
114114
&& rm -rf /var/lib/apt/lists/*; \
115115
find / -depth \
116-
\( -name .cache -o -name __pycache__ -o -name *.pyc -o -name *.a -o -name .git -o -name .github \) \
116+
\( -name .cache -o -name __pycache__ -o -name '*.pyc' -o -name .git -o -name .github \) \
117117
-exec 'rm' '-rf' '{}' '+'
118118

119119
COPY cli /cli

theia/ide/admin/cli/anubis/assignment/pipeline.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def post(path: str, data: dict, params=None):
2727
# Attempt to contact the pipeline API
2828
try:
2929
res = requests.post(
30-
'http://pipeline-api:5000' + path,
30+
'http://anubis-pipeline-api:5000' + path,
3131
headers=headers,
3232
params=params,
3333
json=data,

theia/ide/admin/latest.package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
"vscode-builtin-theme-defaults": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-defaults-1.39.1-prel.vsix",
5252
"vscode-builtin-yaml": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/yaml-1.39.1-prel.vsix",
5353
"vscode-editorconfig": "https://github.com/theia-ide/editorconfig-vscode/releases/download/v0.14.4/EditorConfig-0.14.4.vsix",
54-
"vscode-python": "https://github.com/microsoft/vscode-python/releases/download/2020.1.58038/ms-python-release.vsix"
54+
"vscode-python": "https://github.com/microsoft/vscode-python/releases/download/2020.1.58038/ms-python-release.vsix",
55+
"vscode-builtin-theme-defaults": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-defaults-1.39.1-prel.vsix"
56+
5557
}
5658
}

theia/ide/devops/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ RUN set -eux; apt-get update; \
117117
rm -rf /var/cache/apt/*; \
118118
rm -rf /var/lib/apt/lists/*; \
119119
find / -depth \
120-
\( -name .cache -o -name __pycache__ -o -name *.pyc -o -name *.a -o -name .git -o -name .github \) \
120+
\( -name .cache -o -name __pycache__ -o -name '*.pyc' -o -name .git -o -name .github \) \
121121
-exec 'rm' '-rf' '{}' '+'; \
122122
rm -rf /home/node; \
123123
find /usr/local -depth \
124124
\( \
125125
\( -type d -a \( -name test -o -name tests -o -name idle_test -o -name __pycache__ \) \) \
126-
-o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
126+
-o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
127127
\) -exec 'rm' '-rf' '{}' '+'
128128

129129
COPY motd.txt /etc/motd

theia/ide/devops/latest.package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"vscode-builtin-xml": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/xml-1.39.1-prel.vsix",
6363
"vscode-builtin-yaml": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/yaml-1.39.1-prel.vsix",
6464
"vscode-editorconfig": "https://github.com/theia-ide/editorconfig-vscode/releases/download/v0.14.4/EditorConfig-0.14.4.vsix",
65-
"vscode-python": "https://open-vsx.org/api/ms-python/python/2020.8.105369/file/ms-python.python-2020.8.105369.vsix"
65+
"vscode-python": "https://open-vsx.org/api/ms-python/python/2020.8.105369/file/ms-python.python-2020.8.105369.vsix",
66+
"vscode-builtin-theme-defaults": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-defaults-1.39.1-prel.vsix",
6667
}
6768
}

theia/ide/xv6/Dockerfile

+6-8
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-
ARG NODE_VERSION=12.18.3
3+
ARG NODE_VERSION=12.22.6
44

55
FROM node:${NODE_VERSION}-buster as theia
66

@@ -21,14 +21,14 @@ RUN set -ex; \
2121
apt-get install -y --no-install-recommends \
2222
wget gpg apt-transport-https ca-certificates apt-utils; \
2323
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -; \
24-
echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-12 main" \
24+
echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster main" \
2525
> /etc/apt/sources.list.d/llvm.list; \
2626
apt-get update; \
2727
apt-get install -y --no-install-recommends \
2828
zsh gdb git build-essential cmake \
29-
gcc-multilib g++-multilib \
29+
gcc-multilib g++-multilib libc6-dev \
3030
python3 python3-pip \
31-
clangd-12 \
31+
clangd \
3232
qemu-system-i386 \
3333
libsecret-1-0; \
3434
yarn --pure-lockfile; \
@@ -46,7 +46,6 @@ RUN set -ex; \
4646
cd /home/anubis; \
4747
cp /etc/skel/.bash_logout /etc/skel/.bashrc /etc/skel/.profile /home/anubis/; \
4848
pip3 install --no-cache-dir supervisor; \
49-
ln -s /usr/bin/clangd-12 /usr/bin/clangd; \
5049
echo 'cat /etc/motd' >> /etc/skel/.bashrc; \
5150
echo 'set auto-load safe-path /' > /etc/skel/.gdbinit; \
5251
echo 'source /opt/pwndbg/gdbinit.py' >> /etc/skel/.gdbinit; \
@@ -56,14 +55,13 @@ RUN set -ex; \
5655
cd /home/anubis; \
5756
chmod g+rw /home; \
5857
chown -R anubis:anubis /home/anubis; \
59-
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
58+
apt reinstall libc6-dev libgcc-8-dev libgcc1 gcc-8 -y; \
6059
rm -rf /tmp/*; \
6160
rm -rf /usr/share/doc; \
62-
rm -rf /var/cache/apt/*; \
6361
rm -rf /var/lib/apt/lists/*; \
6462
rm -rf /home/node/*; \
6563
find / -depth \
66-
\( -name .cache -o -name __pycache__ -o -name '*.pyc' -o -name '*.a' -o -name .git -o -name .github \) \
64+
\( -name .cache -o -name __pycache__ -o -name '*.pyc' -o -name .git -o -name .github \) \
6765
-exec 'rm' '-rf' '{}' '+';
6866

6967
COPY supervisord.conf autosave-dump.sh /

theia/ide/xv6/latest.package.json

+1-10
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,14 @@
1717
"@theia/callhierarchy": "latest",
1818
"@theia/console": "latest",
1919
"@theia/core": "latest",
20-
"@theia/cpp-debug": "latest",
2120
"@theia/debug": "latest",
22-
"@theia/editor": "latest",
2321
"@theia/editor-preview": "latest",
2422
"@theia/file-search": "latest",
25-
"@theia/filesystem": "latest",
2623
"@theia/getting-started": "latest",
2724
"@theia/git": "latest",
28-
"@theia/keymaps": "latest",
2925
"@theia/markers": "latest",
3026
"@theia/messages": "latest",
31-
"@theia/metrics": "latest",
3227
"@theia/mini-browser": "latest",
33-
"@theia/monaco": "latest",
3428
"@theia/navigator": "latest",
3529
"@theia/outline-view": "latest",
3630
"@theia/output": "latest",
@@ -39,13 +33,9 @@
3933
"@theia/plugin-ext-vscode": "latest",
4034
"@theia/preferences": "latest",
4135
"@theia/preview": "latest",
42-
"@theia/process": "latest",
43-
"@theia/scm": "latest",
4436
"@theia/search-in-workspace": "latest",
45-
"@theia/task": "latest",
4637
"@theia/terminal": "latest",
4738
"@theia/typehierarchy": "latest",
48-
"@theia/userstorage": "latest",
4939
"@theia/variable-resolver": "latest",
5040
"@theia/vsx-registry": "latest",
5141
"@theia/workspace": "latest"
@@ -70,6 +60,7 @@
7060
"vscode-builtin-yaml": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/yaml-1.39.1-prel.vsix",
7161
"vscode-clangd": "https://open-vsx.org/api/llvm-vs-code-extensions/vscode-clangd/0.1.7/file/llvm-vs-code-extensions.vscode-clangd-0.1.7.vsix",
7262
"vscode-editorconfig": "https://github.com/theia-ide/editorconfig-vscode/releases/download/v0.14.4/EditorConfig-0.14.4.vsix",
63+
"vscode-builtin-theme-defaults": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-defaults-1.39.1-prel.vsix",
7364
"plantuml": "https://open-vsx.org/api/jebbs/plantuml/2.14.0/file/jebbs.plantuml-2.14.0.vsix",
7465
"webfreak-debug": "https://open-vsx.org/api/webfreak/debug/0.25.0/file/webfreak.debug-0.25.0.vsix"
7566
}

0 commit comments

Comments
 (0)