docker is unneccessary
This commit is contained in:
parent
8d2edcc69f
commit
eab5d644fb
4 changed files with 15 additions and 17 deletions
2
Makefile
2
Makefile
|
@ -12,7 +12,7 @@ db d-build: ## build docker image
|
||||||
$(call msg,Building Docker Image)
|
$(call msg,Building Docker Image)
|
||||||
@DOCKER_BUILDKIT=1 docker build \
|
@DOCKER_BUILDKIT=1 docker build \
|
||||||
--secret id=GITHUB_TOKEN \
|
--secret id=GITHUB_TOKEN \
|
||||||
--progress=plain \
|
$(if DOCKER_ARGS,$(DOCKER_ARGS),)\
|
||||||
-f docker/Dockerfile \
|
-f docker/Dockerfile \
|
||||||
-t dots .
|
-t dots .
|
||||||
|
|
||||||
|
|
|
@ -30,13 +30,15 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
|
||||||
|
|
||||||
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
|
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
|
||||||
|
|
||||||
|
|
||||||
USER "${USER}"
|
USER "${USER}"
|
||||||
WORKDIR /home/"${USER}"
|
WORKDIR /home/"${USER}"
|
||||||
|
|
||||||
RUN sh -c "$(curl -fsLS https://chezmoi.io/get)"
|
RUN sh -c "$(curl -fsLS https://chezmoi.io/get)"
|
||||||
|
|
||||||
COPY . .dotfiles
|
COPY --chown="${USER}:${USER}" . .dotfiles
|
||||||
|
|
||||||
|
# let chezmoi add the plugins
|
||||||
|
RUN git config --global --add safe.directory '*'
|
||||||
|
|
||||||
RUN ./bin/chezmoi init \
|
RUN ./bin/chezmoi init \
|
||||||
--apply \
|
--apply \
|
||||||
|
@ -52,16 +54,11 @@ USER root
|
||||||
RUN --mount=type=secret,id=GITHUB_TOKEN \
|
RUN --mount=type=secret,id=GITHUB_TOKEN \
|
||||||
GITHUB_TOKEN=$(cat /run/secrets/GITHUB_TOKEN) \
|
GITHUB_TOKEN=$(cat /run/secrets/GITHUB_TOKEN) \
|
||||||
/home/daylin/.dotfiles/docker/install-tools.sh
|
/home/daylin/.dotfiles/docker/install-tools.sh
|
||||||
USER daylin
|
USER "${USER}"
|
||||||
|
|
||||||
ENV DOTFILES_DIR="/home/daylin/.dotfiles" \
|
ENV DOTFILES_DIR="/home/daylin/.dotfiles" \
|
||||||
PATH="$PATH:/home/daylin/bin:/home/daylin/.dotfiles/bin"
|
PATH="$PATH:/home/daylin/bin:/home/daylin/.dotfiles/bin"
|
||||||
|
|
||||||
# RUN tree
|
|
||||||
RUN echo "$PATH"
|
|
||||||
# get shell extensions
|
|
||||||
RUN sheldon -q --config-file ~/.config/sheldon/plugins.toml lock
|
|
||||||
|
|
||||||
# install general tools used by neovim
|
# install general tools used by neovim
|
||||||
RUN ~/.dotfiles/docker/install-dev-envs.sh
|
RUN ~/.dotfiles/docker/install-dev-envs.sh
|
||||||
|
|
||||||
|
|
|
@ -1,21 +1,22 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
# eget() {
|
|
||||||
# "$HOME/bin/eget" "$@"
|
|
||||||
# }
|
|
||||||
#
|
|
||||||
export PATH="$PATH:/home/daylin/bin:/home/daylin/.dotfiles/bin"
|
export PATH="$PATH:/home/daylin/bin:/home/daylin/.dotfiles/bin"
|
||||||
export EGET_BIN=/home/$USER/bin
|
export EGET_BIN=/home/$USER/bin
|
||||||
export EGET_CONFIG=/home/$USER/.config/eget/eget.toml
|
export EGET_CONFIG=/home/$USER/.config/eget/eget.toml
|
||||||
export DOTFILES_DIR=/home/$USER/.dotfiles
|
export DOTFILES_DIR=/home/$USER/.dotfiles
|
||||||
|
|
||||||
|
echo $HOME
|
||||||
|
# until next version release
|
||||||
|
cp "$EGET_CONFIG" "/root/.eget.toml"
|
||||||
|
|
||||||
curl https://zyedidia.github.io/eget.sh | sh && mv ./eget ./bin/eget
|
curl https://zyedidia.github.io/eget.sh | sh && mv ./eget ./bin/eget
|
||||||
eget Tomwright/dasel --asset dasel_linux_amd64
|
eget Tomwright/dasel --asset dasel_linux_amd64
|
||||||
|
|
||||||
aweget $(awk '{printf "-i %s ", $0}' "$DOTFILES_DIR/docker/tools.txt")
|
aweget --verbose \
|
||||||
|
$(awk '{printf "-i %s ", $0}' "$DOTFILES_DIR/docker/tools.txt")
|
||||||
|
|
||||||
# eget rossmacarthur/sheldon
|
# eget rossmacarthur/sheldon
|
||||||
eget tree-sitter/tree-sitter
|
eget tree-sitter/tree-sitter --to "$EGET_BIN/tree-sitter"
|
||||||
|
|
||||||
# installing nvim
|
# installing nvim
|
||||||
eget neovim/neovim --to ./nvim.appimage --pre-release
|
eget neovim/neovim --to ./nvim.appimage --pre-release
|
||||||
|
|
|
@ -16,8 +16,8 @@ except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
EGET_CONFIG = os.getenv("EGET_CONFIG", Path.home() /
|
EGET_CONFIG = Path(os.getenv("EGET_CONFIG", Path.home() /
|
||||||
".config" / "eget" / "eget.toml")
|
".config" / "eget" / "eget.toml"))
|
||||||
|
|
||||||
|
|
||||||
class Color:
|
class Color:
|
||||||
|
|
Loading…
Reference in a new issue