Jelajahi Sumber

Added env vars for git auth

josh 3 tahun lalu
induk
melakukan
d0532a15e6
4 mengubah file dengan 20 tambahan dan 5 penghapusan
  1. 8 5
      base/Dockerfile
  2. 6 0
      base/build-home.sh
  3. 4 0
      docker-compose.yml
  4. 2 0
      env.example

+ 8 - 5
base/Dockerfile

@@ -8,7 +8,10 @@ ARG DEVENV_PASS
 ARG DEVENV_EMAIL
 ARG DEVENV_MOUNT_PATH
 ARG DEVENV_GIT_DEF_BRANCH
-
+ARG DEVENV_GH_USER
+ARG DEVENV_GH_PASS
+ARG DEVENV_SH_USER
+ARG DEVENV_SH_PASS
 
 ENV TZ=$DEVENV_TZ
 ENV DEVENV_LOCALE=$DEVENV_LOCALE
@@ -17,21 +20,22 @@ ENV DEVENV_PASS=$DEVENV_PASS
 ENV DEVENV_EMAIL=$DEVENV_EMAIL
 ENV DEVENV_MOUNT_PATH=$DEVENV_MOUNT_PATH
 ENV DEVENV_GIT_DEF_BRANCH=$DEVENV_GIT_DEF_BRANCH
+ENV DEVENV_GH_USER=$DEVENV_GH_USER
+ENV DEVENV_GH_PASS=$DEVENV_GH_PASS
+ENV DEVENV_SH_USER=$DEVENV_SH_USER
+ENV DEVENV_SH_PASS=$DEVENV_SH_PASS
 
 ENV LANG=$DEVENV_LOCALE
 ENV NVIM_LISTEN_ADDRESS=/home/${DEVENV_USER}/nvimsocket
 ENV DEBIAN_FRONTEND=noninteractive
 
-
 COPY base/build-install.sh /build-install.sh
 RUN /build-install.sh
 
-
 FROM devinstall AS devbase
 COPY base/build-root.sh /build-root.sh
 RUN /build-root.sh
 
-
 FROM devbase AS devinit
 USER ${DEVENV_USER}
 WORKDIR /home/${DEVENV_USER}
@@ -39,7 +43,6 @@ RUN sudo chown -R ${DEVENV_USER}:${DEVENV_USER} /home/${DEVENV_USER}
 COPY base/build-init-user.sh /home/${DEVENV_USER}/build-init-user.sh
 RUN ./build-init-user.sh
 
-
 FROM devinit AS devenv
 USER ${DEVENV_USER}
 WORKDIR /home/${DEVENV_USER}

+ 6 - 0
base/build-home.sh

@@ -5,5 +5,11 @@ git config --global user.name $DEVENV_USER
 git config --global user.email $DEVENV_EMAIL
 git config --global core.editor "NVIM_LISTEN_ADDRESS=/home/$DEVENV_USER/nvimsocket nvr --nostart --remote-wait-silent"
 
+git config --global credential.helper store
+
+touch /home/$DEVENV_USER/.git-credentials
+echo "https://$DEVENV_GH_USER:$DEVENV_GH_PASS@github.com" >> /home/$DEVENV_USER/.git-credentials
+echo "https://$DEVENV_SH_USER:$DEVENV_SH_PASS@git.brickner.cloud" >> /home/$DEVENV_USER/.git-credentials
+
 ~/setup.sh
 

+ 4 - 0
docker-compose.yml

@@ -12,6 +12,10 @@ services:
         - "DEVENV_EMAIL=${DEVENV_EMAIL}"
         - "DEVENV_LOCALE=${DEVENV_LOCALE}"
         - "DEVENV_MOUNT_PATH=${DEVENV_MOUNT_PATH}"
+        - "DEVENV_GH_USER=${DEVENV_GH_USER}"
+        - "DEVENV_GH_PASS=${DEVENV_GH_PASS}"
+        - "DEVENV_SH_USER=${DEVENV_SH_USER}"
+        - "DEVENV_SH_PASS=${DEVENV_SH_PASS}"
         - "PATH=$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/home/${DEVENV_USER}/perl5/bin"
     volumes:
       - ${DEVENV_MOUNT_PATH}:/home/${DEVENV_USER}/host

+ 2 - 0
env.example

@@ -5,3 +5,5 @@ DEVENV_PASS="secret"
 DEVENV_EMAIL="email@example.com"
 DEVENV_MOUNT_PATH=$HOME
 DEVENV_GIT_DEF_BRANCH="main"
+DEVENV_GH_USER=""
+DEVENV_GH_PASS=""