From 98e1fbb071dd4d751d41da2568266caf0ad22608 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 24 Sep 2023 00:33:39 +0200 Subject: [PATCH] Use nixos for dev image --- docker/Dockerfile.dev | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 1dd9bfc..525aaf5 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,16 +1,9 @@ -FROM ubuntu as godeps -RUN apt update && apt install -y golang && apt dist-upgrade -y -RUN go install github.com/sqlc-dev/sqlc/cmd/sqlc@latest -RUN go install github.com/go-task/task/v3/cmd/task@latest -RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest - -FROM ubuntu -RUN apt update && apt install -y golang nodejs yarn bash curl git && apt dist-upgrade -y +FROM nixos/nix ENV PATH="/root/.yarn/bin/:${PATH}" -WORKDIR /src/web +RUN nix-env --install go go-task sqlc nodejs yarn ADD web/package.json web/yarn.lock /src/web/ +WORKDIR /src/web +RUN yarn WORKDIR /src VOLUME /go VOLUME /.cache -RUN yarn -COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/