Skip to content

Commit 256b015

Browse files
committed
fix(Docker): ignore Extension/build in .dockerignore
1 parent 14407f4 commit 256b015

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ Extension/dist
2626
Extension/openwpm.xpi
2727
Extension/src/content.js
2828
Extension/src/feature.js
29+
Extension/build

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM krallin/ubuntu-tini:bionic
1+
FROM ubuntu:xenial
22

33
SHELL ["/bin/bash", "-c"]
44

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ Then you can run the demo script using:
272272
```bash
273273
mkdir -p docker-volume && docker run -v $PWD/docker-volume:/opt/OpenWPM/datadir \
274274
-e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --shm-size=2g \
275-
-it openwpm
275+
-it --init openwpm
276276
```
277277

278278
**Note:** the `--shm-size=2g` parameter is required, as it increases the

scripts/run-on-osx-via-docker.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ rm -rf test/__pycache__/
1515

1616
# Allow access to XQuartz for the current IP
1717
export IP=$(ifconfig en0 | grep inet | awk '$1=="inet" {print $2}')
18-
xhost + $IP
18+
xhost + "$IP"
1919
export DISPLAY=$IP:0
2020

2121
# start the docker environment with X server forwarding
2222
if [ "$#" == 0 ]; then
2323
echo "Starting a shell in the Docker environment"
2424
else
25-
echo "Running '$@' in the Docker environment"
25+
echo "Running '$*' in the Docker environment"
2626
fi
2727
docker run \
28-
-v $PWD/docker-volume:/home/user/Desktop/ \
29-
-v $PWD:/opt/OpenWPM/ \
30-
-e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --shm-size=2g \
31-
-it openwpm $@
28+
-v "$PWD"/docker-volume:/home/user/Desktop/ \
29+
-v "$PWD":/opt/OpenWPM/ \
30+
-e DISPLAY="$DISPLAY" -v /tmp/.X11-unix:/tmp/.X11-unix --shm-size=2g \
31+
-it --init openwpm "$@"

0 commit comments

Comments
 (0)