ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-25 07:52:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

build: simplify image build interface

Browse Source 
This removes the baked in codedump inspection and wrapper scripts
in favour of downstream tooling overriding this as necessary by
using FROM <image> in their respective dockerfile.
This commit is contained in:
Brendan Hay 2019-10-21 10:03:41 +02:00 committed by Jared Tobin
parent 3210acd4de
commit 4813d9829b
No known key found for this signature in database
GPG Key ID: 0E4647D58F8A69E4
3 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nix/ops/image/default.nix
View File

@ -2,33 +2,18 @@
let
name = urbit.meta.name;
debug = urbit.meta.debug;
exe = ''${urbit.meta.exe} "$@"'';
coredump = ''
ulimit -c unlimited
${exe} || \
${pkgs.gdb}/bin/gdb -ex "thread apply all bt" -ex "set pagination 0" -batch \
${urbit.meta.bin} \
/tmp/cores/core*
'';
entrypoint = pkgs.writeScript "entrypoint.sh" ''
#!${pkgs.stdenv.shell}
set -euo pipefail
${pkgs.coreutils}/bin/ln -sf ${pill} /data/urbit.pill
${if debug then coredump else exe}
${urbit.meta.exe} "$@"
'';
in
pkgs.dockerTools.buildImage {
inherit name;
name = urbit.meta.name;
runAsRoot = ''
#!${pkgs.stdenv.shell}
@ -39,17 +24,21 @@ pkgs.dockerTools.buildImage {
${pkgs.dockerTools.shadowSetup}
mkdir -p /data /tmp/cores
mkdir -p /bin /share /data /tmp
${pkgs.coreutils}/bin/ln -sf ${pill} /share/urbit.pill
${pkgs.coreutils}/bin/ln -sf ${entrypoint} /bin/urbit
'';
config = {
Entrypoint = entrypoint;
Entrypoint = [ "urbit" ];
WorkingDir = "/data";
Env = [ "PATH=/bin" ];
Volumes = {
"/data" = {};
"/tmp" = {};
};
ExposedPorts = {

4
nix/pkgs/urbit/default.nix
View File

@ -12,8 +12,8 @@ let
meta = rec {
inherit debug;
bin = "${urbit}/bin/${name}";
flags = if debug then "-g" else "";
exe = "${meta.bin} ${meta.flags}";
flags = if debug then [ "-g" ] else [];
exe = ''${meta.bin} ${pkgs.lib.strings.concatStringsSep " " meta.flags}'';
};
deps =

17
sh/image
View File

@ -6,13 +6,6 @@ say() {
echo "$1" >&2
}
git_sha="$(git rev-parse HEAD)"
git_sha="${git_sha:0:8}"
git_branch="$(git branch --show-current)"
git_tag="${git_branch}-${git_sha}"
say "Building nix/ops/image..."
nix_out="$(nix-build nix/ops -A image --no-out-link "$@")"
@ -20,11 +13,5 @@ say "Loading $nix_out into Docker..."
nix_name="$(docker load --quiet --input $nix_out)"
nix_name="${nix_name#Loaded image: }"
say "Re-tagging with git metadata..."
image_repo="$(docker images $nix_name --format '{{.Repository}}')"
image_name="${image_repo}:${git_tag}"
docker tag $nix_name $image_name
# Output only the new tag on stdout for subsequent pipes/tooling.
say $nix_name
echo $image_name
# Output only the tag on stdout for subsequent pipes/tooling.
echo $nix_name