update install.sh (#1057)

* update install.sh

* delete Dockerfile

* place back a test dockerfile

* add regression CI

* on PR

Author: joshspicer

.github/workflows/container-features-regression.yml

@@ -0,0 +1,39 @@
+name: Container Features Regression Test
+
+on: 
+  workflow_dispatch:
+  push:
+    branches: [main]
+    paths:
+      - 'script-library/container-features/**'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'script-library/container-features/**'  
+
+jobs:
+  test-script-library:
+    name: Run test script
+    if: "!contains(github.event.head_commit.message, 'Automated update') && !contains(github.event.head_commit.message, 'CI ignore')"
+    runs-on: ubuntu-latest
+    steps:
+    - name: Free more space
+      id: free_space 
+      run: |
+        set -e
+        # Ensure enough space is available for build
+        sudo apt-get autoremove -y
+        sudo apt-get clean -y
+        sudo rm -rf /usr/share/dotnet
+
+    - name: Checkout
+      id: checkout
+      uses: actions/checkout@v1
+
+    - name: Run test
+      id: run_test_script
+      run: |
+        set -e
+        cd ./script-library/container-features
+        ./test.sh

script-library/container-features/src/install.sh

@@ -2,10 +2,10 @@
 set -e
 
 set -a
-. /tmp/library-scripts/features.env
+. /tmp/build-features/features.env
 set +a
 
-chmod +x /tmp/library-scripts/*.sh
+chmod +x *.sh
 
 # Execute option scripts if correct environment variable is set to "true"
 while IFS= read -r feature_line; do
@@ -17,9 +17,9 @@ while IFS= read -r feature_line; do
         feature_script_and_args="${feature_script_and_args%\"}"
         # Execute the script line - but do not quote so arguments can be included in the 
         echo "${feature_script_and_args#\"}"
-        eval "/tmp/library-scripts/${feature_script_and_args#\"}"
+        eval "./${feature_script_and_args#\"}"
     fi
-done < /tmp/library-scripts/feature-scripts.env
+done < ./feature-scripts.env
 
 # Clean up
 apt-get autoremove -y

script-library/container-features/src/java-wrapper.sh

@@ -9,9 +9,9 @@ USERNAME=${3:-"automatic"}
 UPDATE_RC=${4:-"true"}
 ADDITIONAL_JAVA_VERSION=11
 
-/tmp/library-scripts/java-debian.sh "${JAVA_VERSION}" "${SDKMAN_DIR}" "${USERNAME}" "${UPDATE_RC}"
+/tmp/build-features/java-debian.sh "${JAVA_VERSION}" "${SDKMAN_DIR}" "${USERNAME}" "${UPDATE_RC}"
 
 # If the user selected JDK 8, install the JDK 11 as well
 if echo "${JAVA_VERSION}" | grep -E '^8([\s\.]|$)' > /dev/null 2>&1; then
-    /tmp/library-scripts/java-debian.sh "${ADDITIONAL_JAVA_VERSION}" "${SDKMAN_DIR}" "${USERNAME}" "${UPDATE_RC}"
+    /tmp/build-features/java-debian.sh "${ADDITIONAL_JAVA_VERSION}" "${SDKMAN_DIR}" "${USERNAME}" "${UPDATE_RC}"
 fi

script-library/container-features/src/Dockerfile renamed to script-library/container-features/test.Dockerfile

@@ -3,11 +3,13 @@ FROM $BASE_IMAGE
 
 USER root
 
-COPY *.env *.sh /tmp/library-scripts/
-RUN /tmp/library-scripts/install.sh \
-    && rm -rf /tmp/library-scripts
+COPY . /tmp/build-features/
+
+RUN cd /tmp/build-features \
+&& chmod +x ./install.sh \
+&& ./install.sh
 
 #{containerEnv}
 
 ARG IMAGE_USER=root
-USER $IMAGE_USER
+USER $IMAGE_USER

script-library/container-features/test.sh

@@ -21,7 +21,7 @@ if [ ! -z "${PLATFORMS}" ]; then
     docker run --privileged --rm tonistiigi/binfmt --install ${PLATFORMS}
     PLATFORMS_ARG="--builder vscode-dev-containers --platform ${PLATFORMS}"
 fi
-docker buildx build --progress plain --load ${PLATFORMS_ARG} --build-arg BASE_IMAGE=$IMAGE_TO_TEST -t container-features-regression out
+docker buildx build --progress plain --load ${PLATFORMS_ARG} --build-arg BASE_IMAGE=$IMAGE_TO_TEST -t container-features-regression -f test.Dockerfile out
 docker run --init --privileged container-features-regression bash -c 'uname -m && env'
 
 # Remove features.env from out folder so we can use it to test the VS Code extension