on master help sign in
Merge pull request #255 from obsidiansystems/docker-builder

Bump nix-docker

commitfdb1d7a25f5624ff1a4dbc353adfdaaae41dbefc authorLuigy Leon <luichi.19@gmail.com> dateFri 19 Oct 2018, 09:37 (8 years ago) parentd8e4d7a80d6602
1 file changed+4−3
lib/command/src/Obelisk/Command/VmBuilder.hs+4−3
lib/command/src/Obelisk/Command/VmBuilder.hs+4−3
@@ -141,11 +141,11 @@ testLinuxBuild stateDir =
141141 , "--builders", nixBuildersArgString stateDir
142142 ]
143143
144−-- Copied from https://raw.githubusercontent.com/LnL7/nix-docker/bf28b99aebd8e403d2fc2171f4fa8878f857171c/ssh/Dockerfile
144+-- Copied from https://github.com/LnL7/nix-docker/blob/8dcfb3aff1f87cdafeecb0d27964b27c3fb8b1d2/ssh/Dockerfile
145145-- Renamed "insecure_rsa" to 'sshKeyFileName'
146146dockerfile :: Text
147147dockerfile = [hereLit|
148−FROM lnl7/nix:2018-04-17
148+FROM lnl7/nix:2018-09-21
149149
150150RUN nix-env -f '<nixpkgs>' -iA \
151151 gnused \
@@ -170,7 +170,8 @@ RUN mkdir -p /etc/ssh \
170170 ] <> [hereLit|
171171
172172EXPOSE 22
173−CMD ["/nix/store/hpnx760s247labqc3nbn2kripk73p0ca-openssh-7.6p1/bin/sshd", "-D", "-e"]
173+CMD ["/nix/store/mydwfxzk8bka4iwjml033dir6gkmqwic-openssh-7.7p1/bin/sshd", "-D", "-e"]
174+
174175|]
175176
176177sshKeyFileName :: FilePath