Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bazel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/toktok/bazel:913b05c1lqrbd4ac130l6zvzy1bzhc7f AS base
FROM ghcr.io/toktok/bazel:base AS base
# Build the base image in a single layer instead of 100 as done by arion.
FROM scratch
# hadolint ignore=DL3022
Expand All @@ -7,8 +7,8 @@ COPY --from=base / /
CMD ["/usr/sbin/init"]

# We need to know where our bash is, because we haven't set up /bin/sh yet.
ENV NIXOS_VERSION="3a7affa77a5a539afa1c7859e2c31abdb1aeadf3"
SHELL ["/nix/store/35yc81pz0q5yba14lxhn5r3jx5yg6c3l-bash-interactive-5.3p3/bin/bash", "-o", "pipefail", "-c"]
ENV NIXOS_VERSION="549bd84d6279f9852cae6225e372cc67fb91a4c1"
SHELL ["/nix/store/4bwbk4an4bx7cb8xwffghvjjyfyl7m2i-bash-interactive-5.3p9/bin/bash", "-o", "pipefail", "-c"]

# Run activation script (init knows where it is).
RUN /usr/sbin/init || true
Expand Down
4 changes: 2 additions & 2 deletions bazel/arion-pkgs.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let
nixpkgs = builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/3a7affa77a5a539afa1c7859e2c31abdb1aeadf3.tar.gz";
sha256 = "sha256:0bzpgy08ym73g6z9wk3pmsbygv0kq46s6dfc7jwmrh3s5iwngrdf";
url = "https://github.com/NixOS/nixpkgs/archive/549bd84d6279f9852cae6225e372cc67fb91a4c1.tar.gz";
sha256 = "sha256:0dchsfq8czjg8iwr60fxmqnglllchcy64wp60b8wx4wd9mwn0rw4";
};
in
(import nixpkgs { system = "x86_64-linux"; }).pkgs
2 changes: 1 addition & 1 deletion bazel/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if ! which nix-shell; then
sh install.sh --no-daemon --no-channel-add --yes
rm install.sh
. "$HOME/.nix-profile/etc/profile.d/nix.sh"
nix-channel --add https://github.com/NixOS/nixpkgs/archive/3a7affa77a5a539afa1c7859e2c31abdb1aeadf3.tar.gz nixpkgs
nix-channel --add https://github.com/NixOS/nixpkgs/archive/549bd84d6279f9852cae6225e372cc67fb91a4c1.tar.gz nixpkgs
nix-channel --update
fi

Expand Down
Loading