Merge pull request #438 from Brikaa/nix-env-sockets
RUNTIME_SET env choice in start-dev & websockets support in Nix Piston
This commit is contained in:
commit
d1315b1196
|
@ -9,4 +9,4 @@ COPY flake.nix flake.lock /piston/packages/
|
||||||
ARG RUNTIMESET=all
|
ARG RUNTIMESET=all
|
||||||
ENV PISTON_RUNTIME_SET=$RUNTIMESET
|
ENV PISTON_RUNTIME_SET=$RUNTIMESET
|
||||||
|
|
||||||
RUN piston-install
|
RUN piston-install
|
||||||
|
|
|
@ -281,7 +281,7 @@ class Job {
|
||||||
if (this.runtime.compiled) {
|
if (this.runtime.compiled) {
|
||||||
eventBus.emit('stage', 'compile');
|
eventBus.emit('stage', 'compile');
|
||||||
const { error, code, signal } = await this.safe_call(
|
const { error, code, signal } = await this.safe_call(
|
||||||
path.join(this.runtime.pkgdir, 'compile'),
|
this.runtime.compile,
|
||||||
code_files.map(x => x.name),
|
code_files.map(x => x.name),
|
||||||
this.timeouts.compile,
|
this.timeouts.compile,
|
||||||
this.memory_limits.compile,
|
this.memory_limits.compile,
|
||||||
|
@ -294,7 +294,7 @@ class Job {
|
||||||
this.logger.debug('Running');
|
this.logger.debug('Running');
|
||||||
eventBus.emit('stage', 'run');
|
eventBus.emit('stage', 'run');
|
||||||
const { error, code, signal } = await this.safe_call(
|
const { error, code, signal } = await this.safe_call(
|
||||||
path.join(this.runtime.pkgdir, 'run'),
|
this.runtime.run,
|
||||||
[code_files[0].name, ...this.args],
|
[code_files[0].name, ...this.args],
|
||||||
this.timeouts.run,
|
this.timeouts.run,
|
||||||
this.memory_limits.run,
|
this.memory_limits.run,
|
||||||
|
|
5
piston
5
piston
|
@ -58,6 +58,10 @@ case "$SUBCOMMAND" in
|
||||||
|
|
||||||
start-dev)
|
start-dev)
|
||||||
build_base
|
build_base
|
||||||
|
runtime_set=all
|
||||||
|
if [[ ! -z "$1" ]]; then
|
||||||
|
runtime_set=$1
|
||||||
|
fi
|
||||||
docker run \
|
docker run \
|
||||||
--rm \
|
--rm \
|
||||||
-p 2000:2000 \
|
-p 2000:2000 \
|
||||||
|
@ -65,6 +69,7 @@ case "$SUBCOMMAND" in
|
||||||
--name $CONTAINER_NAME \
|
--name $CONTAINER_NAME \
|
||||||
-e PISTON_LOG_LEVEL=DEBUG \
|
-e PISTON_LOG_LEVEL=DEBUG \
|
||||||
-e PISTON_FLAKE_PATH=/piston/packages \
|
-e PISTON_FLAKE_PATH=/piston/packages \
|
||||||
|
-e PISTON_RUNTIME_SET=$runtime_set \
|
||||||
-v $PWD:/piston/packages \
|
-v $PWD:/piston/packages \
|
||||||
-d "$IMAGE_NAME_DEV:$IMAGE_TAG"
|
-d "$IMAGE_NAME_DEV:$IMAGE_TAG"
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in New Issue