Skip to content

Commit 786ba22

Browse files
Temporarily remove remotefuse from jupyter-aou devcontainer (#227)
remotefuse is likely leading to files disappearing from the bucket. Temporarily disable it to make the app useable until we can get a proper fix PHP-87353
1 parent ce1ee53 commit 786ba22

File tree

4 files changed

+8
-59
lines changed

4 files changed

+8
-59
lines changed

src/jupyter-aou/.devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"shutdownAction": "none",
66
"workspaceFolder": "/workspace",
77
"initializeCommand": "umount -f /tmp/wb-mount/*; rm -rf /tmp/wb-mount/*",
8-
"postCreateCommand": "./startup.sh && ./startupscript/post-startup.sh jupyter /home/jupyter \"${templateOption:cloud}\" \"${templateOption:login}\"",
8+
"postCreateCommand": "./startupscript/post-startup.sh jupyter /home/jupyter \"${templateOption:cloud}\" \"${templateOption:login}\"",
99
// re-mount bucket files on container start up
10-
"postStartCommand": "./startup.sh && ./startupscript/remount-on-restart.sh jupyter /home/jupyter \"${templateOption:cloud}\" \"${templateOption:login}\"",
10+
"postStartCommand": "./startupscript/remount-on-restart.sh jupyter /home/jupyter \"${templateOption:cloud}\" \"${templateOption:login}\"",
1111
"features": {
1212
"./.devcontainer/features/workbench-tools": {}
1313
},

src/jupyter-aou/build/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,5 @@ RUN jupyter labextension disable @jupyterlab/filebrowser-extension:download && \
2727
RUN --mount=type=bind,from=extension-builder,source=/dist,target=/tmp/extensions \
2828
/tmp/extensions/install.sh
2929

30-
USER root
31-
COPY remotefuse /opt/remotefuse
32-
RUN chmod +x /opt/remotefuse/*
30+
# TODO(PHP-87353): Add remotefuse back. See https://github.com/verily-src/workbench-app-devcontainers/pull/227
3331
USER $JUPYTER_USER

src/jupyter-aou/docker-compose.yaml

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,42 +10,24 @@ services:
1010
restart: always
1111
volumes:
1212
- .:/workspace:cached
13-
- /tmp/wb-mount:/home/jupyter/workspace:slave
14-
- ssh-keys:/ssh-keys
1513
ports:
1614
- "8888:8888"
1715
networks:
1816
- app-network
1917
depends_on:
2018
- wondershaper
21-
- remotefuse
19+
cap_add:
20+
- SYS_ADMIN
21+
devices:
22+
- /dev/fuse
23+
# TODO(PHP-87353): Add remotefuse back. See https://github.com/verily-src/workbench-app-devcontainers/pull/227
2224
wondershaper:
2325
container_name: "wondershaper"
2426
image: "us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-wondershaper@sha256:dd9df1811b9d15f4f8d95b6e515a2371e12d238240b8ef7359be77d961e79e3a"
2527
restart: always
2628
network_mode: "host"
2729
cap_add:
2830
- NET_ADMIN
29-
remotefuse:
30-
container_name: "remotefuse"
31-
build:
32-
context: ./remotefuse
33-
platforms:
34-
- "linux/amd64"
35-
restart: always
36-
working_dir: /workspace
37-
volumes:
38-
- .:/workspace:cached
39-
- ssh-keys:/ssh-keys
40-
- /tmp/wb-mount:/home/remotefuse/workspace:shared
41-
networks:
42-
- app-network
43-
cap_add:
44-
- SYS_ADMIN
45-
devices:
46-
- /dev/fuse
4731
networks:
4832
app-network:
4933
external: true
50-
volumes:
51-
ssh-keys:

src/jupyter-aou/startup.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)