Skip to content

Commit

Permalink
FIX minor issues fall21 (#236)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
wabscale authored Sep 8, 2021
1 parent 21d3210 commit aa961c5
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 26 deletions.
2 changes: 1 addition & 1 deletion api/anubis/utils/k8s/theia.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def create_theia_k8s_pod_pvc(theia_session: TheiaSession) -> Tuple[client.V1Pod,
name='docker-config',
secret=client.V1SecretVolumeSource(
default_mode=0o644,
secret_name="anubis",
secret_name="anubis-registry",
items=[
client.V1KeyToPath(
key=".dockerconfigjson",
Expand Down
2 changes: 1 addition & 1 deletion k8s/chart/templates/api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ spec:
httpGet:
path: /
port: 5000
initialDelaySeconds: 1
initialDelaySeconds: 3
periodSeconds: 1
failureThreshold: 60
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion theia/ide/admin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ RUN adduser --disabled-password --gecos '' --uid 1001 anubis; \
&& rm -rf /var/cache/apt/* \
&& rm -rf /var/lib/apt/lists/*; \
find / -depth \
\( -name .cache -o -name __pycache__ -o -name *.pyc -o -name *.a -o -name .git -o -name .github \) \
\( -name .cache -o -name __pycache__ -o -name '*.pyc' -o -name .git -o -name .github \) \
-exec 'rm' '-rf' '{}' '+'

COPY cli /cli
Expand Down
2 changes: 1 addition & 1 deletion theia/ide/admin/cli/anubis/assignment/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def post(path: str, data: dict, params=None):
# Attempt to contact the pipeline API
try:
res = requests.post(
'http://pipeline-api:5000' + path,
'http://anubis-pipeline-api:5000' + path,
headers=headers,
params=params,
json=data,
Expand Down
4 changes: 3 additions & 1 deletion theia/ide/admin/latest.package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
"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",
"vscode-builtin-yaml": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/yaml-1.39.1-prel.vsix",
"vscode-editorconfig": "https://github.com/theia-ide/editorconfig-vscode/releases/download/v0.14.4/EditorConfig-0.14.4.vsix",
"vscode-python": "https://github.com/microsoft/vscode-python/releases/download/2020.1.58038/ms-python-release.vsix"
"vscode-python": "https://github.com/microsoft/vscode-python/releases/download/2020.1.58038/ms-python-release.vsix",
"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"

}
}
4 changes: 2 additions & 2 deletions theia/ide/devops/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ RUN set -eux; apt-get update; \
rm -rf /var/cache/apt/*; \
rm -rf /var/lib/apt/lists/*; \
find / -depth \
\( -name .cache -o -name __pycache__ -o -name *.pyc -o -name *.a -o -name .git -o -name .github \) \
\( -name .cache -o -name __pycache__ -o -name '*.pyc' -o -name .git -o -name .github \) \
-exec 'rm' '-rf' '{}' '+'; \
rm -rf /home/node; \
find /usr/local -depth \
\( \
\( -type d -a \( -name test -o -name tests -o -name idle_test -o -name __pycache__ \) \) \
-o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
-o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
\) -exec 'rm' '-rf' '{}' '+'

COPY motd.txt /etc/motd
Expand Down
3 changes: 2 additions & 1 deletion theia/ide/devops/latest.package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"vscode-builtin-xml": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/xml-1.39.1-prel.vsix",
"vscode-builtin-yaml": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/yaml-1.39.1-prel.vsix",
"vscode-editorconfig": "https://github.com/theia-ide/editorconfig-vscode/releases/download/v0.14.4/EditorConfig-0.14.4.vsix",
"vscode-python": "https://open-vsx.org/api/ms-python/python/2020.8.105369/file/ms-python.python-2020.8.105369.vsix"
"vscode-python": "https://open-vsx.org/api/ms-python/python/2020.8.105369/file/ms-python.python-2020.8.105369.vsix",
"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",
}
}
14 changes: 6 additions & 8 deletions theia/ide/xv6/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# https://github.com/theia-ide/theia-apps/tree/master/theia-cpp-docker

ARG NODE_VERSION=12.18.3
ARG NODE_VERSION=12.22.6

FROM node:${NODE_VERSION}-buster as theia

Expand All @@ -21,14 +21,14 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \
wget gpg apt-transport-https ca-certificates apt-utils; \
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -; \
echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-12 main" \
echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster main" \
> /etc/apt/sources.list.d/llvm.list; \
apt-get update; \
apt-get install -y --no-install-recommends \
zsh gdb git build-essential cmake \
gcc-multilib g++-multilib \
gcc-multilib g++-multilib libc6-dev \
python3 python3-pip \
clangd-12 \
clangd \
qemu-system-i386 \
libsecret-1-0; \
yarn --pure-lockfile; \
Expand All @@ -46,7 +46,6 @@ RUN set -ex; \
cd /home/anubis; \
cp /etc/skel/.bash_logout /etc/skel/.bashrc /etc/skel/.profile /home/anubis/; \
pip3 install --no-cache-dir supervisor; \
ln -s /usr/bin/clangd-12 /usr/bin/clangd; \
echo 'cat /etc/motd' >> /etc/skel/.bashrc; \
echo 'set auto-load safe-path /' > /etc/skel/.gdbinit; \
echo 'source /opt/pwndbg/gdbinit.py' >> /etc/skel/.gdbinit; \
Expand All @@ -56,14 +55,13 @@ RUN set -ex; \
cd /home/anubis; \
chmod g+rw /home; \
chown -R anubis:anubis /home/anubis; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
apt reinstall libc6-dev libgcc-8-dev libgcc1 gcc-8 -y; \
rm -rf /tmp/*; \
rm -rf /usr/share/doc; \
rm -rf /var/cache/apt/*; \
rm -rf /var/lib/apt/lists/*; \
rm -rf /home/node/*; \
find / -depth \
\( -name .cache -o -name __pycache__ -o -name '*.pyc' -o -name '*.a' -o -name .git -o -name .github \) \
\( -name .cache -o -name __pycache__ -o -name '*.pyc' -o -name .git -o -name .github \) \
-exec 'rm' '-rf' '{}' '+';

COPY supervisord.conf autosave-dump.sh /
Expand Down
11 changes: 1 addition & 10 deletions theia/ide/xv6/latest.package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,14 @@
"@theia/callhierarchy": "latest",
"@theia/console": "latest",
"@theia/core": "latest",
"@theia/cpp-debug": "latest",
"@theia/debug": "latest",
"@theia/editor": "latest",
"@theia/editor-preview": "latest",
"@theia/file-search": "latest",
"@theia/filesystem": "latest",
"@theia/getting-started": "latest",
"@theia/git": "latest",
"@theia/keymaps": "latest",
"@theia/markers": "latest",
"@theia/messages": "latest",
"@theia/metrics": "latest",
"@theia/mini-browser": "latest",
"@theia/monaco": "latest",
"@theia/navigator": "latest",
"@theia/outline-view": "latest",
"@theia/output": "latest",
Expand All @@ -39,13 +33,9 @@
"@theia/plugin-ext-vscode": "latest",
"@theia/preferences": "latest",
"@theia/preview": "latest",
"@theia/process": "latest",
"@theia/scm": "latest",
"@theia/search-in-workspace": "latest",
"@theia/task": "latest",
"@theia/terminal": "latest",
"@theia/typehierarchy": "latest",
"@theia/userstorage": "latest",
"@theia/variable-resolver": "latest",
"@theia/vsx-registry": "latest",
"@theia/workspace": "latest"
Expand All @@ -70,6 +60,7 @@
"vscode-builtin-yaml": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/yaml-1.39.1-prel.vsix",
"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",
"vscode-editorconfig": "https://github.com/theia-ide/editorconfig-vscode/releases/download/v0.14.4/EditorConfig-0.14.4.vsix",
"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",
"plantuml": "https://open-vsx.org/api/jebbs/plantuml/2.14.0/file/jebbs.plantuml-2.14.0.vsix",
"webfreak-debug": "https://open-vsx.org/api/webfreak/debug/0.25.0/file/webfreak.debug-0.25.0.vsix"
}
Expand Down

0 comments on commit aa961c5

Please sign in to comment.