diff options
| -rw-r--r-- | c_debian/Dockerfile | 7 | ||||
| -rw-r--r-- | compose.yaml | 19 | ||||
| -rw-r--r-- | scripts/provision-user.sh | 8 |
3 files changed, 23 insertions, 11 deletions
diff --git a/c_debian/Dockerfile b/c_debian/Dockerfile index 5a1d311..00b7dd1 100644 --- a/c_debian/Dockerfile +++ b/c_debian/Dockerfile @@ -6,7 +6,6 @@ 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 @@ -14,8 +13,12 @@ WORKDIR /home/compromyse ENV USER=compromyse ENV CONFIG=d +RUN mkdir ~/.ssh +RUN --mount=type=secret,id=id_rsa,required sudo cp /run/secrets/id_rsa ~/.ssh/id_rsa +RUN --mount=type=secret,id=id_rsa_pub,required sudo cp /run/secrets/id_rsa_pub ~/.ssh/id_rsa.pub +RUN sudo chown compromyse:compromyse ~/.ssh/id_rsa ~/.ssh/id_rsa.pub + COPY scripts/provision-user.sh /tmp/provision-user.sh RUN bash /tmp/provision-user.sh -# RUN rm /tmp/provision-user.sh CMD [ "cat" ] diff --git a/compose.yaml b/compose.yaml index cc56803..25dddf3 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,15 +1,26 @@ services: - main: + debian: + container_name: debian build: - context: ../../ - dockerfile: containers/debian/Dockerfile + context: . + dockerfile: c_debian/Dockerfile + secrets: + - id_rsa + - id_rsa_pub + stdin_open: true tty: true volumes: - - ~/.ssh:/home/compromyse/.ssh - ~/shared:/shared deploy: resources: limits: cpus: '4' memory: 56gb + + +secrets: + id_rsa: + file: /home/compromyse/.ssh/id_rsa + id_rsa_pub: + file: ~/.ssh/id_rsa.pub diff --git a/scripts/provision-user.sh b/scripts/provision-user.sh index 659feef..44472f4 100644 --- a/scripts/provision-user.sh +++ b/scripts/provision-user.sh @@ -12,11 +12,9 @@ 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 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 +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/$CONFIG/home.nix $HOME/.config/home-manager/home.nix @@ -29,4 +27,4 @@ home-manager switch -b backup rm $HOME/result -# ~/.tmux/plugins/tpm/bin/install_plugins +~/.tmux/plugins/tpm/bin/install_plugins |