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

Add dev/prod conditions in the nix files

This commit is contained in:
Omar Brikaa 2022-02-12 20:09:41 +02:00
parent b8e2af412e
commit 97fd8a16d4
3 changed files with 60 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
api/default.nix
View File

@ -1,4 +1,4 @@
{pkgs, nosocket, ...}: {pkgs, nosocket, appEnv, ...}:
with pkgs; rec { with pkgs; rec {
package = mkYarnPackage { package = mkYarnPackage {
name = "piston"; name = "piston";
@ -25,11 +25,8 @@ with pkgs; rec {
}; };
}; };
}; };
container = pkgs.dockerTools.buildLayeredImageWithNixDb {
name = "piston";
tag = "base-latest";
contents = with pkgs; [ basePackages = with pkgs; [
package package
nosocket nosocket
bash bash
@ -42,6 +39,8 @@ with pkgs; rec {
gnugrep gnugrep
rename rename
util-linux util-linux
];
devPackages = with pkgs; [
nodejs-16_x nodejs-16_x
yarn yarn
python3 python3
@ -50,7 +49,7 @@ with pkgs; rec {
gnused gnused
]; ];
extraCommands = '' baseCommands = ''
mkdir -p piston/{jobs,runtimes} etc/nix {,var/}tmp run/lock mkdir -p piston/{jobs,runtimes} etc/nix {,var/}tmp run/lock
echo -e "experimental-features = nix-command flakes" >> etc/nix/nix.conf echo -e "experimental-features = nix-command flakes" >> etc/nix/nix.conf
echo "nixbld:x:30000:nixbld1,nixbld10,nixbld11,nixbld12,nixbld13,nixbld14,nixbld15,nixbld16,nixbld17,nixbld18,nixbld19,nixbld2,nixbld20,nixbld21,nixbld22,nixbld23,nixbld24,nixbld25,nixbld26,nixbld27,nixbld28,nixbld29,nixbld3,nixbld30,nixbld31,nixbld32,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9" >> etc/group echo "nixbld:x:30000:nixbld1,nixbld10,nixbld11,nixbld12,nixbld13,nixbld14,nixbld15,nixbld16,nixbld17,nixbld18,nixbld19,nixbld2,nixbld20,nixbld21,nixbld22,nixbld23,nixbld24,nixbld25,nixbld26,nixbld27,nixbld28,nixbld29,nixbld3,nixbld30,nixbld31,nixbld32,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9" >> etc/group
@ -59,12 +58,22 @@ with pkgs; rec {
echo "nixbld$i:x:$(( $i + 30000 )):30000:Nix build user $i:/var/empty:/run/current-system/sw/bin/nologin" >> etc/passwd echo "nixbld$i:x:$(( $i + 30000 )):30000:Nix build user $i:/var/empty:/run/current-system/sw/bin/nologin" >> etc/passwd
done done
chmod 1777 {,var/}tmp/
'';
devCommands = ''
mkdir -p usr/bin mkdir -p usr/bin
ln -s /bin/env usr/bin/env ln -s /bin/env usr/bin/env
chmod -R 1777 usr chmod -R 1777 usr
chmod 1777 {,var/}tmp/
''; '';
container = pkgs.dockerTools.buildLayeredImageWithNixDb {
name = "piston";
tag = "base-latest";
contents = if appEnv == "dev" then basePackages ++ devPackages else basePackages;
extraCommands = if appEnv == "dev" then baseCommands + devCommands else baseCommands;
config = { config = {
Cmd = ["${package}/bin/pistond"]; Cmd = ["${package}/bin/pistond"];
Env = [ Env = [

16
flake.nix
View File

@ -6,9 +6,16 @@
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
baseContainer = (import ./api { _nosocket = self.legacyPackages."${system}".nosocket;
inherit pkgs; _devContainer = (import ./api {
nosocket = self.legacyPackages."${system}".nosocket; inherit pkgs _nosocket;
nosocket = _nosocket;
appEnv = "dev";
}).container;
_prodContainer = (import ./api {
inherit pkgs _nosocket;
nosocket = _nosocket;
appEnv = "prod";
}).container; }).container;
args = { args = {
inherit pkgs; inherit pkgs;
@ -74,6 +81,7 @@
piston = (import ./api { inherit pkgs nosocket; }).package; piston = (import ./api { inherit pkgs nosocket; }).package;
}; };
container = baseContainer; devContainer = _devContainer;
prodContainer = _prodContainer;
}; };
} }

5
piston
View File

@ -13,7 +13,8 @@ SUBCOMMAND="$1"
shift shift
build_base() { build_base() {
CONTAINER_PATH="$(nix build ".#container" --no-link --json | jq '.[0].outputs.out' -r)" container_flake_key=$([[ $1 == "dev" ]] && echo "devContainer" || echo "prodContainer")
CONTAINER_PATH="$(nix build ".#$container_flake_key" --no-link --json | jq '.[0].outputs.out' -r)"
echo "The image archive was created at: $CONTAINER_PATH" 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
@ -64,7 +65,7 @@ case "$SUBCOMMAND" in
echo "Removing the Nix volume if it exists" echo "Removing the Nix volume if it exists"
docker volume rm -f $DEV_VOLUME_NAME docker volume rm -f $DEV_VOLUME_NAME
echo "Building the base docker image" echo "Building the base docker image"
build_base build_base dev
echo "Installing the required node modules" echo "Installing the required node modules"
docker run \ docker run \
--rm \ --rm \