Use local websockify when building container

It's very surprising to get some external copy of websockify when you
are building an image in your local websockify source tree. Make sure we
are using the local copy of everything.
This commit is contained in:
Pierre Ossman
2022-12-16 13:04:24 +01:00
parent 1979e92f0e
commit 4f9d496dfe
4 changed files with 11 additions and 18 deletions
+1 -2
View File
@@ -178,8 +178,7 @@ The entrypoint of the image is the `run` command.
To build the image:
```
cd docker
docker build -t novnc/websockify .
./docker/build.sh
```
Once built you can just launch it with the same
+5 -10
View File
@@ -1,12 +1,9 @@
FROM python:3.6
FROM python
ENV VERSION 0.10.0
COPY websockify-*.tar.gz /
RUN mkdir -p /opt/websockify \
&& curl -SL https://github.com/novnc/websockify/archive/refs/tags/v$VERSION.tar.gz \
| tar xzC /opt/websockify
RUN python -m pip install 'numpy<1.17' redis simplejson jwcrypto requests
RUN python3 -m pip install websockify-*.tar.gz
RUN rm -rf /websockify-* /root/.cache
VOLUME /data
@@ -15,7 +12,5 @@ EXPOSE 443
WORKDIR /opt/websockify
COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"]
ENTRYPOINT ["/usr/local/bin/websockify"]
CMD ["--help"]
+5
View File
@@ -0,0 +1,5 @@
#!/usr/bin/env sh
set -e -x
cd "$(dirname "$0")"
(cd .. && python3 setup.py sdist --dist-dir docker/)
docker build -t novnc/websockify .
-6
View File
@@ -1,6 +0,0 @@
#!/bin/sh
# vim: tabstop=4 shiftwidth=4 softtabstop=4
set -e
/opt/websockify/websockify-$VERSION/run "$@"