chore(stacks): add profile.d dir

Author: duanhongyi

Dockerfile

@@ -45,3 +45,6 @@ RUN install-packages \
         python3-pip \
         default-libmysqlclient-dev; \
     pip install oss2
+
+ADD ruby.sh /etc/profile.d/ruby.sh
+ENV ENV /etc/profile.d/*

scripts/stack-utils

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -e
-set -u
 
 shopt -s expand_aliases
 alias gzip="gzip -n -9"

stacks/erlang/build.sh

@@ -11,12 +11,11 @@ libodbc1
 libsctp1
 libwxgtk3.0
 EOF
-  export PATH="/opt/drycc/erlang/bin:$PATH"
-  export C_INCLUDE_PATH="/opt/drycc/erlang/include"
-  export CPLUS_INCLUDE_PATH="/opt/drycc/erlang/include"
-  export LIBRARY_PATH="/opt/drycc/erlang/lib"
-  export LD_LIBRARY_PATH="/opt/drycc/erlang/lib"
-  export PKG_CONFIG_PATH="/opt/drycc/erlang/lib/pkg-config"
+  mkdir -p /opt/drycc/erlang/profile.d
+  cat  << EOF > /opt/drycc/erlang/profile.d/erlang.sh
+export PATH="/opt/drycc/erlang/bin:\$PATH"
+EOF
+  . /opt/drycc/erlang/profile.d/erlang.sh
   ./make.sh
   cp -rf /opt/drycc/erlang /workspace/"${TARNAME}"/data
 }

stacks/go/build.sh

@@ -5,9 +5,14 @@
 
 # Implement build function
 function build() {
-    curl -L -o /opt/drycc/tmp.tar.gz https://go.dev/dl/go"${STACK_VERSION}".linux-"${OS_ARCH}".tar.gz
-    cd /opt/drycc && tar -xvzf tmp.tar.gz && rm -rf tmp.tar.gz && cd -
-    cp -rf /opt/drycc/go "${TARNAME}"/data
+  curl -L -o /opt/drycc/tmp.tar.gz https://go.dev/dl/go"${STACK_VERSION}".linux-"${OS_ARCH}".tar.gz
+  cd /opt/drycc && tar -xvzf tmp.tar.gz && rm -rf tmp.tar.gz && cd -
+  mkdir -p /opt/drycc/erlang/profile.d
+  cat  << EOF > /opt/drycc/go/profile.d/go.sh
+export GOPATH="/opt/drycc/go"
+export PATH="\$GOPATH/bin:\$PATH"
+EOF
+  cp -rf /opt/drycc/go "${TARNAME}"/data
 }
 
 # call build stack

stacks/grafana/build.sh

@@ -9,6 +9,10 @@ function build() {
   tar -xvzf tmp.tar.gz
   mv grafana-${STACK_VERSION} ${TARNAME}/data/grafana
   rm tmp.tar.gz
+  mkdir ${TARNAME}/data/grafana/profile.d
+  cat  << EOF > ${TARNAME}/data/grafana/profile.d/grafana.sh
+export PATH="/opt/drycc/grafana/bin:\$PATH"
+EOF
 }
 
 # call build stack

stacks/influxdb/build.sh

@@ -5,13 +5,17 @@
 
 # Implement build function
 function build() {
-  BIN_DIR="${TARNAME}/data/common/bin"
+  BIN_DIR="${TARNAME}/data/influxdb/bin"
   mkdir -p "${BIN_DIR}"
 
   curl -fsSL -o tmp.tar.gz https://dl.influxdata.com/influxdb/releases/influxdb2-${STACK_VERSION}-linux-${OS_ARCH}.tar.gz
   tar -xvzf tmp.tar.gz
   mv influxdb2-${STACK_VERSION}-linux-${OS_ARCH}/influxd "${BIN_DIR}"/influxd
   rm -rf tmp.tar.gz influxdb2-${STACK_VERSION}-linux-${OS_ARCH}
+  cat  << EOF > ${TARNAME}/data/influxdb/profile.d/influxdb.sh
+export PATH="/opt/drycc/influxdb/bin:\$PATH"
+EOF
+
 }
 
 # call build stack

stacks/minio/build.sh

@@ -5,10 +5,14 @@
 
 # Implement build function
 function build() {
-  BIN_DIR="${TARNAME}/data/common/bin"
+  BIN_DIR="${TARNAME}/data/minio/bin"
   mkdir -p "${BIN_DIR}"
   curl -fsSL -o "${BIN_DIR}"/"${STACK_NAME}" https://dl.min.io/server/minio/release/linux-${OS_ARCH}/minio.${STACK_VERSION}
   chmod +x "${BIN_DIR}"/"${STACK_NAME}"
+
+cat  << EOF > ${TARNAME}/data/minio/profile.d/minio.sh
+export PATH="/opt/drycc/minio/bin:\$PATH"
+EOF
 }
 
 # call build stack

stacks/podman/build.sh

@@ -62,23 +62,24 @@ EOF
 
   mv /opt/drycc/podman/bin/podman /opt/drycc/podman/bin/podman-original
   cat << EOF > "/opt/drycc/podman/bin/podman"
-#!/bin/bash
-
 if [ ! -d "/opt/cni" ];then
   ln -s /opt/drycc/podman/opt/cni /opt/cni
 fi
 
 if [ ! -d "/etc/containers" ];then
   ln -s /opt/drycc/podman/etc/containers /etc/containers
 fi
-
 exec /opt/drycc/podman/bin/podman-original --runtime /opt/drycc/podman/bin/crun "\$@"
 EOF
   chmod +x /opt/drycc/podman/bin/podman
+  mkdir -p /opt/drycc/podman/profile.d
   mkdir -p /opt/drycc/podman/etc/containers
   mkdir -p /opt/drycc/podman/run/containers/storage
   mkdir -p /opt/drycc/podman/var/lib/containers/storage
   mkdir -p /opt/drycc/podman/var/lib/shared
+  cat << EOF > "/opt/drycc/podman/profile.d/podman.sh"
+export PATH="/opt/drycc/podman/bin:\$PATH"
+EOF
   cat << EOF > "/opt/drycc/podman/etc/containers/storage.conf"
 [storage]
 driver = "overlay"

stacks/python/build.sh

@@ -11,12 +11,16 @@ libffi-dev
 pkg-config
 libsqlite3-dev
 EOF
-  export PATH="/opt/drycc/python/bin:$PATH"
-  export C_INCLUDE_PATH="/opt/drycc/python/include"
-  export CPLUS_INCLUDE_PATH="/opt/drycc/python/include"
-  export LIBRARY_PATH="/opt/drycc/python/lib"
-  export LD_LIBRARY_PATH="/opt/drycc/python/lib"
-  export PKG_CONFIG_PATH="/opt/drycc/python/lib/pkg-config"
+  mkdir /opt/drycc/python/profile.d
+  cat << EOF > /opt/drycc/python/profile.d/python.sh
+  export PATH="/opt/drycc/python/bin:\$PATH"
+  export C_INCLUDE_PATH="/opt/drycc/python/include:\$C_INCLUDE_PATH"
+  export CPLUS_INCLUDE_PATH="/opt/drycc/python/include:\$CPLUS_INCLUDE_PATH"
+  export LIBRARY_PATH="/opt/drycc/python/lib:\$LIBRARY_PATH"
+  export LD_LIBRARY_PATH="/opt/drycc/python/lib:\$LD_LIBRARY_PATH"
+  export PKG_CONFIG_PATH="/opt/drycc/python/lib/pkg-config:\$PKG_CONFIG_PATH"
+EOF
+  . /opt/drycc/python/profile.d/python.sh
   ./make.sh
   cp -rf /opt/drycc/python /workspace/"${TARNAME}"/data
 }

stacks/rabbitmq/build.sh

@@ -17,6 +17,12 @@ EOF
   cp "${TARNAME}"/data/rabbitmq/plugins/rabbitmq_management-*/priv/www/cli/rabbitmqadmin "${TARNAME}"/data/rabbitmq/sbin
   chmod +x "${TARNAME}"/data/rabbitmq/sbin/rabbitmqadmin
   rm -rf tmp.tar
+
+  mkdir "${TARNAME}"/data/rabbitmq/profile.d
+  cat << EOF > "${TARNAME}"/data/rabbitmq/profile.d/rabbitmq.sh
+  export PATH="/opt/drycc/rabbitmq/sbin:\$PATH"
+EOF
+
 }
 
 # call build stack