diff options
| -rw-r--r-- | c_debian/Dockerfile (renamed from containers/debian/Dockerfile) | 9 | ||||
| -rw-r--r-- | compose.yaml (renamed from containers/debian/compose.yaml) | 5 | ||||
| l--------- | containers/debian/scripts | 1 | ||||
| -rw-r--r-- | debian/Vagrantfile | 2 | ||||
| -rw-r--r-- | scripts/provision-root.sh | 2 | ||||
| -rw-r--r-- | scripts/provision-user.sh | 10 |
6 files changed, 20 insertions, 9 deletions
diff --git a/containers/debian/Dockerfile b/c_debian/Dockerfile index 537893f..5a1d311 100644 --- a/containers/debian/Dockerfile +++ b/c_debian/Dockerfile @@ -4,11 +4,18 @@ COPY scripts/provision-root.sh /provision-root.sh RUN bash /provision-root.sh RUN rm /provision-root.sh +COPY scripts/provision-docker.sh /tmp/provision-docker.sh +RUN bash /tmp/provision-docker.sh +RUN rm /tmp/provision-docker.sh + USER compromyse WORKDIR /home/compromyse +ENV USER=compromyse +ENV CONFIG=d + COPY scripts/provision-user.sh /tmp/provision-user.sh RUN bash /tmp/provision-user.sh -RUN rm /tmp/provision-user.sh +# RUN rm /tmp/provision-user.sh CMD [ "cat" ] diff --git a/containers/debian/compose.yaml b/compose.yaml index 69860b5..cc56803 100644 --- a/containers/debian/compose.yaml +++ b/compose.yaml @@ -1,9 +1,12 @@ services: main: - build: . + build: + context: ../../ + dockerfile: containers/debian/Dockerfile stdin_open: true tty: true volumes: + - ~/.ssh:/home/compromyse/.ssh - ~/shared:/shared deploy: resources: diff --git a/containers/debian/scripts b/containers/debian/scripts deleted file mode 120000 index 11aee1d..0000000 --- a/containers/debian/scripts +++ /dev/null @@ -1 +0,0 @@ -../../scripts/
\ No newline at end of file diff --git a/debian/Vagrantfile b/debian/Vagrantfile index a4260f6..9ca4ce1 100644 --- a/debian/Vagrantfile +++ b/debian/Vagrantfile @@ -27,5 +27,5 @@ Vagrant.configure('2') do |config| config.vm.provision 'file', source: '~/.ssh/id_rsa.pub', destination: '.ssh/id_rsa.pub' config.vm.provision 'shell', path: '../scripts/provision-root.sh' - config.vm.provision 'shell', path: '../scripts/provision-user.sh', privileged: false + config.vm.provision 'shell', path: '../scripts/provision-user.sh', privileged: false, env: { 'CONFIG': 'v' } end diff --git a/scripts/provision-root.sh b/scripts/provision-root.sh index f44fdba..224a6f1 100644 --- a/scripts/provision-root.sh +++ b/scripts/provision-root.sh @@ -7,6 +7,6 @@ export DEBIAN_FRONTEND=noninteractive apt-get update apt-get upgrade -y -apt-get install -y git +apt-get install -y git curl xz-utils sudo ssh unset DEBIAN_FRONTEND diff --git a/scripts/provision-user.sh b/scripts/provision-user.sh index 39da031..659feef 100644 --- a/scripts/provision-user.sh +++ b/scripts/provision-user.sh @@ -12,12 +12,14 @@ nix-channel --update nix-shell '<home-manager>' -A install . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" +mkdir -p ~/.ssh ssh-keyscan github.com >> ~/.ssh/known_hosts -git clone git@github.com:compromyse/dotfiles $HOME/.config/home-manager/dotfiles -git clone git@github.com:tmux-plugins/tpm $HOME/.tmux/plugins/tpm +git clone https://github.com/compromyse/dotfiles $HOME/.config/home-manager/dotfiles +# git clone git@github.com:compromyse/dotfiles $HOME/.config/home-manager/dotfiles +# git clone git@github.com:tmux-plugins/tpm $HOME/.tmux/plugins/tpm rm $HOME/.config/home-manager/home.nix -ln -s $HOME/.config/home-manager/dotfiles/machines/v/home.nix $HOME/.config/home-manager/home.nix +ln -s $HOME/.config/home-manager/dotfiles/machines/$CONFIG/home.nix $HOME/.config/home-manager/home.nix sudo apt-get purge -y git sudo apt-get autoremove -y @@ -27,4 +29,4 @@ home-manager switch -b backup rm $HOME/result -~/.tmux/plugins/tpm/bin/install_plugins +# ~/.tmux/plugins/tpm/bin/install_plugins |