From 2cd52fca4493879685702514777117f0b6951622 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Fri, 29 Jan 2021 12:22:41 +0000
Subject: [PATCH] Fix docker-fhs

---
 docker.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker.nix b/docker.nix
index 4ff66ef..7257064 100644
--- a/docker.nix
+++ b/docker.nix
@@ -4,34 +4,34 @@
   systemd = {
     services = {
       "docker-build-fhs" = {
-        enable = false;
+        enable = true;
         description = "Create fhs docker container";
         wantedBy = [ "multi-user.target" ];
         script = ''
           mkdir -p /var/docker-fhs && cd /var/docker-fhs
           cat > Dockerfile <<EOF
 
-          FROM ubuntu:disco
+          FROM ubuntu:latest
 
           ENV DEBIAN_FRONTEND noninteractive
 
           RUN apt update && apt upgrade -y && apt install -y wget gnupg
 
-          RUN echo 'deb http://apt.llvm.org/disco/ llvm-toolchain-disco main' \
+          RUN echo 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main' \
                   >> /etc/apt/sources.list.d/llvm.list
           RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add -
           RUN apt update
 
           RUN apt install -y git libssl-dev bison flex bc build-essential gdb
-          RUN apt install -y libelf-dev python python3 zsh repo python3-pip
+          RUN apt install -y libelf-dev python python3 zsh python3-pip
           RUN apt install -y python3-opencv meson ninja-build cmake afl*
-          RUN apt install -y clang-10 lldb-10 llvm-10* libfuzzer-10-dev
+          RUN apt install -y clang-11 lldb-11 llvm-11* libfuzzer-11-dev
           RUN apt install -y pkg-config binutils-dev libunwind-dev
           RUN apt install -y command-not-found libglib2.0-dev bsdmainutils
           RUN apt install -y libarchive-dev nettle-dev
 
           RUN groupmod users -g 100
-          RUN useradd user -u 1000 -g 100 -s /bin/zsh
+          RUN useradd user -u 1002 -g 100 -s /bin/zsh
 
           RUN echo 'cd \$HOST_PWD' >> /etc/zsh/zshrc