diff --git a/docker/Dockerfile.acmesh b/docker/Dockerfile.acmesh index eec3d4b..51776f2 100644 --- a/docker/Dockerfile.acmesh +++ b/docker/Dockerfile.acmesh @@ -6,6 +6,8 @@ RUN echo "Acme.sh: nginxproxymanager/nginx-full:${BASE_TAG:-latest}, ${TARGETPLA ENV CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt +COPY ./files/.bashrc.acmesh /root/.bashrc + # acme.sh RUN mkdir -p /data/acme.sh \ && curl -o /bin/acme.sh 'https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh' \ diff --git a/docker/Dockerfile.acmesh-golang b/docker/Dockerfile.acmesh-golang index 9d0c6c3..86f7be7 100644 --- a/docker/Dockerfile.acmesh-golang +++ b/docker/Dockerfile.acmesh-golang @@ -20,6 +20,8 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" \ WORKDIR /root +COPY ./files/.bashrc.acmesh-golang /root/.bashrc + # Gotools RUN if [ "$TARGETPLATFORM" == "" ] || [ "$TARGETPLATFORM" == "linux/amd64" ]; then cd /usr && wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.39.0; fi RUN go get -u github.com/kyoh86/richgo \ diff --git a/docker/Dockerfile.certbot b/docker/Dockerfile.certbot index 4b67073..3eb2348 100644 --- a/docker/Dockerfile.certbot +++ b/docker/Dockerfile.certbot @@ -59,6 +59,8 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +COPY ./files/.bashrc.certbot /root/.bashrc + # Copy certbot COPY --from=certbotbuilder /opt/certbot /opt/certbot RUN curl -L 'https://bootstrap.pypa.io/get-pip.py' | python3 \ diff --git a/docker/Dockerfile.certbot-node b/docker/Dockerfile.certbot-node index 796016f..c8e82e8 100644 --- a/docker/Dockerfile.certbot-node +++ b/docker/Dockerfile.certbot-node @@ -14,6 +14,8 @@ RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \ && npm install -g yarn \ && ln -s /usr/bin/python3 /usr/bin/python +COPY ./files/.bashrc.certbot-node /root/.bashrc + # Check nodejs works on this architecture COPY ./files/test.js /tmp/test.js RUN node /tmp/test.js \ diff --git a/files/.bashrc b/files/.bashrc index f8b630a..cfedb26 100644 --- a/files/.bashrc +++ b/files/.bashrc @@ -16,7 +16,7 @@ alias h='cd ~;clear;' echo -e -n '\E[1;34m' figlet -w 120 "nginx-full" -echo -e "\E[1;36mOpenResty \E[1;32m${OPENRESTY_VERSION:-unknown}\E[1;36m, ${ID:-debian} \E[1;32m${VERSION:-unknown}\E[1;36m, Certbot \E[1;32m$(certbot --version)\E[0m" +echo -e "\E[1;36mOpenResty \E[1;32m${OPENRESTY_VERSION:-unknown}\E[1;36m, ${ID:-debian} \E[1;32m${VERSION:-unknown}\E[1;36m\E[0m" echo -e -n '\E[1;34m' cat /built-for-arch echo -e '\E[0m' diff --git a/files/.bashrc.acmesh b/files/.bashrc.acmesh new file mode 100644 index 0000000..49553fd --- /dev/null +++ b/files/.bashrc.acmesh @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ -t 1 ]; then + export PS1="\e[1;34m[\e[1;33m\u@\e[1;32mdocker-\h\e[1;37m:\w\[\e[1;34m]\e[1;36m\\$ \e[0m" +fi + +# Aliases +alias l='ls -lAsh --color' +alias ls='ls -C1 --color' +alias cp='cp -ip' +alias rm='rm -i' +alias mv='mv -i' +alias h='cd ~;clear;' + +. /etc/os-release + +echo -e -n '\E[1;34m' +figlet -w 120 "nginx-full" +echo -e "\E[1;36mOpenResty \E[1;32m${OPENRESTY_VERSION:-unknown}\E[1;36m, ${ID:-debian} \E[1;32m${VERSION:-unknown}\E[1;36m, Acme.sh \E[1;32m$(acme.sh --version | tail -1)\E[0m" +echo -e -n '\E[1;34m' +cat /built-for-arch +echo -e '\E[0m' diff --git a/files/.bashrc.acmesh-golang b/files/.bashrc.acmesh-golang new file mode 100644 index 0000000..0b9a18a --- /dev/null +++ b/files/.bashrc.acmesh-golang @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ -t 1 ]; then + export PS1="\e[1;34m[\e[1;33m\u@\e[1;32mdocker-\h\e[1;37m:\w\[\e[1;34m]\e[1;36m\\$ \e[0m" +fi + +# Aliases +alias l='ls -lAsh --color' +alias ls='ls -C1 --color' +alias cp='cp -ip' +alias rm='rm -i' +alias mv='mv -i' +alias h='cd ~;clear;' + +. /etc/os-release + +echo -e -n '\E[1;34m' +figlet -w 120 "nginx-full" +echo -e "\E[1;36mOpenResty \E[1;32m${OPENRESTY_VERSION:-unknown}\E[1;36m, ${ID:-debian} \E[1;32m${VERSION:-unknown}\E[1;36m, Acme.sh \E[1;32m$(acme.sh --version | tail -1)\E[1;36m, go \E[1;32m$(go version)\E[0m" +echo -e -n '\E[1;34m' +cat /built-for-arch +echo -e '\E[0m' diff --git a/files/.bashrc.certbot b/files/.bashrc.certbot new file mode 100644 index 0000000..f8b630a --- /dev/null +++ b/files/.bashrc.certbot @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ -t 1 ]; then + export PS1="\e[1;34m[\e[1;33m\u@\e[1;32mdocker-\h\e[1;37m:\w\[\e[1;34m]\e[1;36m\\$ \e[0m" +fi + +# Aliases +alias l='ls -lAsh --color' +alias ls='ls -C1 --color' +alias cp='cp -ip' +alias rm='rm -i' +alias mv='mv -i' +alias h='cd ~;clear;' + +. /etc/os-release + +echo -e -n '\E[1;34m' +figlet -w 120 "nginx-full" +echo -e "\E[1;36mOpenResty \E[1;32m${OPENRESTY_VERSION:-unknown}\E[1;36m, ${ID:-debian} \E[1;32m${VERSION:-unknown}\E[1;36m, Certbot \E[1;32m$(certbot --version)\E[0m" +echo -e -n '\E[1;34m' +cat /built-for-arch +echo -e '\E[0m' diff --git a/files/.bashrc.certbot-node b/files/.bashrc.certbot-node new file mode 100644 index 0000000..d571f5c --- /dev/null +++ b/files/.bashrc.certbot-node @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ -t 1 ]; then + export PS1="\e[1;34m[\e[1;33m\u@\e[1;32mdocker-\h\e[1;37m:\w\[\e[1;34m]\e[1;36m\\$ \e[0m" +fi + +# Aliases +alias l='ls -lAsh --color' +alias ls='ls -C1 --color' +alias cp='cp -ip' +alias rm='rm -i' +alias mv='mv -i' +alias h='cd ~;clear;' + +. /etc/os-release + +echo -e -n '\E[1;34m' +figlet -w 120 "nginx-full" +echo -e "\E[1;36mOpenResty \E[1;32m${OPENRESTY_VERSION:-unknown}\E[1;36m, ${ID:-debian} \E[1;32m${VERSION:-unknown}\E[1;36m, Certbot \E[1;32m$(certbot --version)\E[1;36m, Node \E[1;32m$(node --version)\E[0m" +echo -e -n '\E[1;34m' +cat /built-for-arch +echo -e '\E[0m'