diff --git a/exec-container/Dockerfile b/exec-container/Dockerfile index 1898ee0..f8410a5 100644 --- a/exec-container/Dockerfile +++ b/exec-container/Dockerfile @@ -1,15 +1,16 @@ # hadolint ignore=DL3029 FROM --platform=amd64 nixos/nix:2.25.2 -# ワークスペースの作成 -RUN mkdir /workspace +# configの修正、ワークスペースの作成 +RUN echo "filter-syscalls = false" >> /etc/nix/nix.conf \ + && mkdir /workspace COPY . /workspace WORKDIR /workspace # ビルド成果物用の空ファイル作成 RUN touch /result \ # ビルドスクリプトの実行権限付与 - && chmod +x /workspace/build-in-docker.sh + && chmod +x /workspace/docker/build-in-docker.sh # ビルドキャッシュとビルド成果物 VOLUME [ "/nix/store", "/result" ] diff --git a/exec-container/docker/build-in-docker.sh b/exec-container/docker/build-in-docker.sh index 26cc669..d62acb7 100644 --- a/exec-container/docker/build-in-docker.sh +++ b/exec-container/docker/build-in-docker.sh @@ -1,7 +1,7 @@ #!/root/.nix-profile/bin/bash # コンテナビルド -if ! nix build --extra-experimental-features nix-command --extra-experimental-features flakes --option filter-syscalls false +if ! nix build --extra-experimental-features nix-command --extra-experimental-features flakes then exit 1 fi diff --git a/exec-container/license-check-in-docker.sh b/exec-container/license-check-in-docker.sh new file mode 100755 index 0000000..8106848 --- /dev/null +++ b/exec-container/license-check-in-docker.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +docker build -t trao-nix . +docker volume create trao-nix_cache +docker run -v ./result:/result -v trao-nix_cache:/nix/store trao-nix /workspace/license-check.sh