diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a7542b93c6afa53a5d7b0c2ab01a1af4d0e78d51..fbec84e28d9048c7ca624d7690efb1fc20a768fe 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -14,7 +14,6 @@ ENV DEV_GID ${DEV_USER_UID} COPY assets/provide-user.sh /docker/ COPY assets/setup.sh /docker/ -COPY assets/user-setup.sh /docker/ COPY assets/build-install-openresty.sh /docker/ RUN yum update -y && \ @@ -26,5 +25,4 @@ COPY --chown=$DEV_USER:$DEV_USER assets/build-install-ngx-voms.sh /home/$DEV_USE USER $DEV_USER -RUN sh /docker/build-install-openresty.sh && \ - sh /docker/user-setup.sh \ No newline at end of file +RUN sh /docker/build-install-openresty.sh \ No newline at end of file diff --git a/.devcontainer/assets/provide-user.sh b/.devcontainer/assets/provide-user.sh index ae8608c86753af6e30c4b4983707de8d96ba5a4b..d68c471d3eaba2e192b23ef23652458c5a3fda3d 100644 --- a/.devcontainer/assets/provide-user.sh +++ b/.devcontainer/assets/provide-user.sh @@ -53,6 +53,24 @@ EOF USER_RC_PATH="/home/${USERNAME}" echo "${CODESPACES_BASH}" >> "${USER_RC_PATH}/.bashrc" + +cat << EOF >> "${USER_RC_PATH}/.bashrc" +if [ -f "\${HOME}/openresty-env" ]; then + . \${HOME}/openresty-env +fi + +if [ -d \${HOME}/bin ]; then + PATH=\${HOME}/bin:\${PATH} +fi + +if [ -n "\${PS1}" ]; then + echo + echo "To build and install openresty with the ngx_http_voms_module run 'build-install-ngx-voms.sh'" + echo "'nginx-httpg_no_delegation.patch' is needed in the directory where the user runs the script" + echo +fi +EOF + chown ${USERNAME}:${USERNAME} "${USER_RC_PATH}/.bashrc" echo "Done!" diff --git a/.devcontainer/assets/user-setup.sh b/.devcontainer/assets/user-setup.sh deleted file mode 100644 index f4ce7ea680040386a8af6cb4d9168c92e9b45fe5..0000000000000000000000000000000000000000 --- a/.devcontainer/assets/user-setup.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# Copyright 2018-2022 Istituto Nazionale di Fisica Nucleare -# SPDX-License-Identifier: EUPL-1.2 - -set -ex - -cat << EOF >> ${HOME}/.bashrc -if [ -f "\${HOME}/openresty-env" ]; then - . \${HOME}/openresty-env -fi - -if [ -d \${HOME}/bin ]; then - PATH=\${HOME}/bin:\${PATH} -fi - -if [ -n "\${PS1}" ]; then - echo - echo "To build and install openresty with the ngx_http_voms_module run 'build-install-ngx-voms.sh'" - echo "'nginx-httpg_no_delegation.patch' is needed in the directory where the user runs the script" - echo -fi -EOF