Bläddra i källkod

Remove hard references

josh 3 år sedan
förälder
incheckning
45dfc9a686
4 ändrade filer med 6 tillägg och 10 borttagningar
  1. 1 1
      Makefile
  2. 2 7
      base/Dockerfile
  3. 2 2
      base/start.sh
  4. 1 0
      docker-compose.yml

+ 1 - 1
Makefile

@@ -5,5 +5,5 @@ build:
 	chmod +x dotfiles/setup.sh
 	docker compose build devenv
 run:
-	docker compose run --rm devenv
+	docker compose run devenv
 

+ 2 - 7
base/Dockerfile

@@ -38,21 +38,16 @@ RUN ./build-init-user.sh
 FROM devinit AS devenv
 USER ${DEVENV_USER}
 WORKDIR /home/${DEVENV_USER}
-
 COPY dotfiles/setup.sh /home/${DEVENV_USER}/setup.sh
 COPY base/init.vim /home/${DEVENV_USER}/.config/nvim/init.vim
 COPY dotfiles/init.vim /home/${DEVENV_USER}/dotfiles/init.vim
 COPY base/build-home.sh /home/${DEVENV_USER}/build-home.sh
-
 RUN /home/${DEVENV_USER}/build-home.sh
-
 COPY base/zshrc /home/${DEVENV_USER}/.zshrc
 COPY dotfiles/zshrc /home/${DEVENV_USER}/dotfiles/zshrc
+COPY base/start.sh /home/${DEVENV_USER}/start.sh
 
-VOLUME /home/${DEVENV_USER}/.config
 VOLUME /home/${DEVENV_USER}/host
 
-COPY base/start.sh /home/${DEVENV_USER}/start.sh
-
-ENTRYPOINT ["/home/josh/start.sh"]
+ENTRYPOINT ["./start.sh"]
 

+ 2 - 2
base/start.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/zsh
 
-source /home/josh/.zshrc
-nvim +cd ~/host
+source /home/$DEVENV_USER/.zshrc
+nvim +cd ~/
 

+ 1 - 0
docker-compose.yml

@@ -15,5 +15,6 @@ services:
         - "PATH=$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/home/${DEVENV_USER}/perl5/bin"
     volumes:
       - ${DEVENV_MOUNT_PATH}:/home/${DEVENV_USER}/host
+      - ./dotfiles:/home/${DEVENV_USER}/all_dotfiles
     extra_hosts:
       - "host.docker.internal:host-gateway"