Mascali
/
piston
mirror of https://github.com/engineer-man/piston.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add none in runtime sets

This commit is contained in:
Omar Brikaa 2022-02-08 17:22:02 +02:00
parent 961b678948
commit c238ff6254
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/bin/pistond.js
View File

@ -39,9 +39,13 @@ expressWs(app);
logger.info('Loading packages'); logger.info('Loading packages');
const runtimes_data = cp.execSync(`nix eval --json ${config.flake_path}#pistonRuntimeSets.${config.runtime_set} --apply builtins.attrNames`).toString(); const runtimes_data = cp
.execSync(
`nix eval --json ${config.flake_path}#pistonRuntimeSets.${config.runtime_set} --apply builtins.attrNames`
)
.toString();
const runtimes = JSON.parse(runtimes_data); const runtimes = JSON.parse(runtimes_data);
runtimes.for_each(pkg => runtime.load_runtime(pkg)); runtimes.for_each(pkg => runtime.load_runtime(pkg));
logger.info('Starting API Server'); logger.info('Starting API Server');

5
flake.nix
View File

@ -2,7 +2,7 @@
description = "Piston packages repo"; description = "Piston packages repo";
inputs.nixpkgs.url = "github:NixOS/nixpkgs"; inputs.nixpkgs.url = "github:NixOS/nixpkgs";
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
@ -66,6 +66,7 @@
pistonRuntimeSets = { pistonRuntimeSets = {
"all" = runtimes; "all" = runtimes;
"bash-only" = runtimeList ["bash"]; "bash-only" = runtimeList ["bash"];
"none" = { };
}; };
legacyPackages."${system}" = rec { legacyPackages."${system}" = rec {
@ -73,6 +74,6 @@
piston = (import ./api { inherit pkgs nosocket; }).package; piston = (import ./api { inherit pkgs nosocket; }).package;
}; };
container = baseContainer; container = baseContainer;
}; };
} }

13
piston
View File

@ -12,7 +12,8 @@ SUBCOMMAND="$1"
shift shift
build_base(){ build_base(){
CONTAINER_PATH="$(nix build ".#container" --no-link --json | jq '.[0].outputs.out' -r)" || exit 1 CONTAINER_PATH="$(nix build ".#container" --no-link --json | jq '.[0].outputs.out' -r)"
echo "The image archive was created at: $CONTAINER_PATH"
docker load -i $CONTAINER_PATH || exit 1 docker load -i $CONTAINER_PATH || exit 1
docker tag "$IMAGE_NAME_DEV:$IMAGE_TAG" "$IMAGE_NAME:$IMAGE_TAG" || exit 1 docker tag "$IMAGE_NAME_DEV:$IMAGE_TAG" "$IMAGE_NAME:$IMAGE_TAG" || exit 1
} }
@ -39,7 +40,7 @@ case "$SUBCOMMAND" in
# dev commands # dev commands
scaffold) scaffold)
pushd $SCRIPT_DIR/runtimes > /dev/null pushd "$SCRIPT_DIR"/runtimes > /dev/null
./scaffold.sh $1 $2 ./scaffold.sh $1 $2
popd > /dev/null popd > /dev/null
;; ;;
@ -50,7 +51,7 @@ case "$SUBCOMMAND" in
# $1 contains a variant to build # $1 contains a variant to build
docker build \ docker build \
--build-arg RUNTIMESET=$1 \ --build-arg RUNTIMESET=$1 \
-f $SCRIPT_DIR/Dockerfile.withset \ -f "$SCRIPT_DIR"/Dockerfile.withset \
-t "$IMAGE_NAME_DEV:$1-latest" \ -t "$IMAGE_NAME_DEV:$1-latest" \
. .
fi fi
@ -70,7 +71,7 @@ case "$SUBCOMMAND" in
-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 \ -e PISTON_RUNTIME_SET=$runtime_set \
-v $PWD:/piston/packages \ -v "$SCRIPT_DIR":/piston/packages \
-d "$IMAGE_NAME_DEV:$IMAGE_TAG" -d "$IMAGE_NAME_DEV:$IMAGE_TAG"
;; ;;
@ -80,9 +81,9 @@ case "$SUBCOMMAND" in
--rm \ --rm \
-it \ -it \
-e PISTON_FLAKE_PATH=/piston/packages \ -e PISTON_FLAKE_PATH=/piston/packages \
-v $PWD:/piston/packages \ -v "$SCRIPT_DIR":/piston/packages \
--name piston_test_runner \ --name piston_test_runner \
-it "$IMAGE_NAME_DEV:$IMAGE_TAG" \ "$IMAGE_NAME_DEV:$IMAGE_TAG" \
piston-test $1 piston-test $1
;; ;;