Merge branch 'main' into jpd-tmux-config
This commit is contained in:
commit
ca655fce13
21
Dockerfile
21
Dockerfile
@ -1,10 +1,18 @@
|
|||||||
FROM ubuntu:mantic-20240216
|
FROM ubuntu:mantic-20240216
|
||||||
|
|
||||||
# system deps
|
# user setup
|
||||||
ARG USER_UID=1000
|
ARG USER_UID=1000
|
||||||
ARG USER_GID=1000
|
ARG USER_GID=1000
|
||||||
ARG DOCKER_GID=999
|
ARG DOCKER_GID=999
|
||||||
ARG WHEEL_GID=980
|
ARG WHEEL_GID=980
|
||||||
|
RUN echo 'remove existing ubuntu user' \
|
||||||
|
&& groupdel --force ubuntu \
|
||||||
|
&& userdel --force ubuntu \
|
||||||
|
&& echo 'setup extra groups' \
|
||||||
|
&& groupadd --gid ${WHEEL_GID} wheel \
|
||||||
|
&& groupadd --gid ${DOCKER_GID} docker
|
||||||
|
|
||||||
|
# system deps
|
||||||
ENV DEBIAN_FRONTEND noninteractive
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y software-properties-common \
|
&& apt-get install -y software-properties-common \
|
||||||
@ -83,15 +91,7 @@ RUN apt-get update \
|
|||||||
zlib1g-dev \
|
zlib1g-dev \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& locale-gen en_US.UTF-8 \
|
&& locale-gen en_US.UTF-8 \
|
||||||
&& echo 'remove existing ubuntu user' \
|
|
||||||
&& groupdel --force ubuntu \
|
|
||||||
&& userdel --force ubuntu \
|
|
||||||
&& echo 'update gid from systemd-journal group' \
|
|
||||||
&& groupmod -g 994 systemd-journal \
|
|
||||||
&& chgrp --recursive systemd-journal /var/log/journal \
|
|
||||||
&& echo 'setup unprivileged user' \
|
&& echo 'setup unprivileged user' \
|
||||||
&& groupadd --gid ${WHEEL_GID} wheel \
|
|
||||||
&& groupadd --gid ${DOCKER_GID} docker \
|
|
||||||
&& groupadd --gid ${USER_GID} coder \
|
&& groupadd --gid ${USER_GID} coder \
|
||||||
&& useradd \
|
&& useradd \
|
||||||
--uid ${USER_UID} \
|
--uid ${USER_UID} \
|
||||||
@ -188,6 +188,7 @@ RUN git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME}
|
|||||||
RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \
|
RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \
|
||||||
awscli \
|
awscli \
|
||||||
bat \
|
bat \
|
||||||
|
bitwarden \
|
||||||
dagger \
|
dagger \
|
||||||
elixir \
|
elixir \
|
||||||
erlang \
|
erlang \
|
||||||
@ -202,6 +203,7 @@ RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \
|
|||||||
lefthook \
|
lefthook \
|
||||||
poetry \
|
poetry \
|
||||||
ripgrep \
|
ripgrep \
|
||||||
|
rust \
|
||||||
starship \
|
starship \
|
||||||
terraform \
|
terraform \
|
||||||
tilt \
|
tilt \
|
||||||
@ -215,6 +217,7 @@ ARG GIT_USER_EMAIL
|
|||||||
ARG GIT_USER_NAME
|
ARG GIT_USER_NAME
|
||||||
RUN git config --global user.email "${GIT_USER_EMAIL}" \
|
RUN git config --global user.email "${GIT_USER_EMAIL}" \
|
||||||
&& git config --global user.name "${GIT_USER_NAME}" \
|
&& git config --global user.name "${GIT_USER_NAME}" \
|
||||||
|
&& git config --global gpg.ssh.allowedSignersFile "${XDG_CONFIG_HOME}/git/allowed_signers" \
|
||||||
&& git config --global core.editor nvim \
|
&& git config --global core.editor nvim \
|
||||||
&& git config --global diff.tool nvimdiff \
|
&& git config --global diff.tool nvimdiff \
|
||||||
&& git config --global difftool.nvimdiff.layout "LOCAL,REMOTE" \
|
&& git config --global difftool.nvimdiff.layout "LOCAL,REMOTE" \
|
||||||
|
@ -0,0 +1,9 @@
|
|||||||
|
[commit]
|
||||||
|
gpgsign = true
|
||||||
|
[gpg]
|
||||||
|
format = ssh
|
||||||
|
[user]
|
||||||
|
email = {{email}}
|
||||||
|
name = {{name}}
|
||||||
|
signingKey = {{path-to-pub-ssh-key}}
|
||||||
|
|
@ -1,6 +1,7 @@
|
|||||||
[tools]
|
[tools]
|
||||||
awscli = "2.15.30"
|
awscli = "2.15.30"
|
||||||
bat = "0.24.0"
|
bat = "0.24.0"
|
||||||
|
bitwarden = "2024.2.1"
|
||||||
dagger = "0.10.2"
|
dagger = "0.10.2"
|
||||||
elixir = "1.16.2-otp-26"
|
elixir = "1.16.2-otp-26"
|
||||||
erlang = "26.2.3"
|
erlang = "26.2.3"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user