Josh Brickner 2 роки тому
батько
коміт
8f7da8425e
4 змінених файлів з 17 додано та 4 видалено
  1. 3 3
      base/Dockerfile
  2. 12 0
      base/build-install.sh
  3. 1 0
      docker-compose.yml
  4. 1 1
      dotfiles

+ 3 - 3
base/Dockerfile

@@ -55,15 +55,15 @@ COPY dotfiles/setup.sh /home/${DEVENV_USER}/setup.sh
 COPY base/build-home.sh /home/${DEVENV_USER}/build-home.sh
 RUN /home/${DEVENV_USER}/build-home.sh
 
+RUN sh -c "$(curl -fLsS https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+RUN rm ~/.zshrc
+
 COPY base/init.vim /home/${DEVENV_USER}/.config/nvim/init.vim
 COPY dotfiles/init.vim /home/${DEVENV_USER}/dotfiles/init.vim
 COPY base/zshrc /home/${DEVENV_USER}/.zshrc
 COPY dotfiles/zshrc /home/${DEVENV_USER}/dotfiles/zshrc
 COPY base/start.sh /home/${DEVENV_USER}/start.sh
 COPY base/open.sh /home/${DEVENV_USER}/open.sh
-RUN sh -c "$(curl -fLsS https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-RUN rm ~/.zshrc
-RUN mv ~/.zshrc.pre-oh-my-zsh ~/.zshrc
 RUN nvim --headless +PlugInstall +qall
 VOLUME /home/${DEVENV_USER}/host
 ENTRYPOINT ["./start.sh"]

+ 12 - 0
base/build-install.sh

@@ -19,6 +19,18 @@ dpkg-reconfigure tzdata
 
 apt install --no-install-recommends -y zsh python2 python3 python3-pip ruby ruby-all-dev nodejs npm sudo curl perl git build-essential ssh ripgrep python3-venv
 
+sudo apt-get install -y apt-transport-https ca-certificates dirmngr
+GNUPGHOME=$(mktemp -d)
+sudo GNUPGHOME="$GNUPGHOME" gpg --no-default-keyring --keyring /usr/share/keyrings/clickhouse-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8919F6BD2B48D754
+sudo rm -r "$GNUPGHOME"
+sudo chmod +r /usr/share/keyrings/clickhouse-keyring.gpg
+
+echo "deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb stable main" | sudo tee \
+    /etc/apt/sources.list.d/clickhouse.list
+sudo apt-get update
+export DEBIAN_FRONTEND=noninteractive
+# sudo apt-get install --no-install-recommends -yq clickhouse-server clickhouse-client
+
 gem install neovim
 
 npm install -g n

+ 1 - 0
docker-compose.yml

@@ -26,6 +26,7 @@ services:
         # - "copilot:/home/${DEVENV_USER}/.config/github-copilot"
     ports:
       - 9004:9004
+      - 9019:8000
     stdin_open: true
     tty: true
     user: "${UID}:${GID}"

+ 1 - 1
dotfiles

@@ -1 +1 @@
-Subproject commit d0f2444a8389942b04142f28802892ac947b2249
+Subproject commit 2c2164cf9051983aa8747cb1a9fc0b5885eb9ab9