diff --git a/neovim.Dockerfile b/neovim.Dockerfile index 98d8166..bbc5748 100644 --- a/neovim.Dockerfile +++ b/neovim.Dockerfile @@ -5,23 +5,23 @@ LABEL maintainer="Luke Griffith " RUN apk add --no-cache neovim git curl editorconfig gcc make musl-dev go npm python3 bash shadow # Create a new user with a home directory -RUN useradd -m -d /home/nvim_user -s /bin/sh nvim_user -RUN chmod 777 /home/nvim_user -RUN chown -R nvim_user:nvim_user /home/nvim_user +RUN useradd -m -d /home/github -s /bin/sh github +RUN chmod 777 /home/github +RUN chown -R github:github /home/github # Set the new user as the default user -USER nvim_user +USER github # Set the working directory to the new user's home -WORKDIR /home/nvim_user +WORKDIR /home/github RUN ls -la /home -ADD setup-nvim-container.sh /home/nvim_user/setup-nvim-container.sh -ADD package-config.sh /home/nvim_user/package-config.sh +ADD setup-nvim-container.sh /home/github/setup-nvim-container.sh +ADD package-config.sh /home/github/package-config.sh -RUN bash /home/nvim_user/setup-nvim-container.sh +RUN bash /home/github/setup-nvim-container.sh WORKDIR /src diff --git a/package-config.sh b/package-config.sh index 93133e5..cfcf58d 100644 --- a/package-config.sh +++ b/package-config.sh @@ -31,7 +31,7 @@ nvim \ -c "MasonInstall $formatted_tools" \ -c "qa" -tar -czvf nvim-offline-deps.tar.gz /nvim_user/.config/nvim /nvim_user/.local/{share,state}/nvim +tar -czvf nvim-offline-deps.tar.gz /github/.config/nvim /github/.local/{share,state}/nvim diff --git a/setup-nvim-container.sh b/setup-nvim-container.sh index fee647c..f388beb 100644 --- a/setup-nvim-container.sh +++ b/setup-nvim-container.sh @@ -1,7 +1,7 @@ #!/bin/bash -mkdir -p /home/nvim_user/bare_config /home/nvim_user/.config/nvim -git clone --bare https://github.com/lukegriffith/kickstart.nvim /home/nvim_user/bare_config -git --git-dir=/home/nvim_user/bare_config --work-tree=/home/nvim_user/.config/nvim pull -git --git-dir=/home/nvim_user/bare_config --work-tree=/home/nvim_user/.config/nvim checkout -f +mkdir -p /home/github/bare_config /home/github/.config/nvim +git clone --bare https://github.com/lukegriffith/kickstart.nvim /home/github/bare_config +git --git-dir=/home/github/bare_config --work-tree=/home/github/.config/nvim pull +git --git-dir=/home/github/bare_config --work-tree=/home/github/.config/nvim checkout -f