[avro] branch master updated: Adjust how dotnet stuff is added to Docker container, add browserify since we claim to support it so having it available for building/testing is needed.

[dk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git


The following commit(s) were added to refs/heads/master by this push:
     new 443614c  Adjust how dotnet stuff is added to Docker container, add browserify since we claim to support it so having it available for building/testing is needed.
443614c is described below

commit 443614c12a15bb58fcf2487eb67ca6f885a68f96
Author: Daniel Kulp <da...@kulp.com>
AuthorDate: Tue Feb 8 11:52:23 2022 -0500

    Adjust how dotnet stuff is added to Docker container, add browserify since we claim to support it so having it available for building/testing is needed.
---
 build.sh                |  2 --
 share/docker/Dockerfile | 25 +++++++------------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/build.sh b/build.sh
index 0cdb88f..231a20e 100755
--- a/build.sh
+++ b/build.sh
@@ -290,8 +290,6 @@ do
         echo "ENV HOME /home/$USER_NAME"
         echo "RUN getent group $GROUP_ID || groupadd -g $GROUP_ID $USER_NAME"
         echo "RUN getent passwd $USER_ID || useradd -g $GROUP_ID -u $USER_ID -k /root -m $USER_NAME"
-        echo "RUN cp -a /root/.dotnet /home/$USER_NAME"
-        echo "RUN chown -R $USER_ID:$GROUP_ID /home/$USER_NAME/.dotnet"
       } > Dockerfile
       # shellcheck disable=SC2086
       tar -cf- lang/ruby/Gemfile Dockerfile | docker build $DOCKER_BUILD_XTRA_ARGS -t "$DOCKER_IMAGE_NAME" -
diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile
index 3422696..8ff6722 100644
--- a/share/docker/Dockerfile
+++ b/share/docker/Dockerfile
@@ -119,6 +119,7 @@ RUN curl -sSL https://deb.nodesource.com/setup_14.x \
  && apt-get -qqy install nodejs \
  && apt-get -qqy clean \
  && npm install -g grunt-cli \
+ && npm install -g browserify \
  && npm cache clean --force
 
 # Install PHP-snappy and PHP-zstd
@@ -191,25 +192,13 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --de
 
 
 # Install .NET SDK
-RUN ARCH="$(uname -m)"; \
- if [ "$ARCH" = "amd64" ]; then \
- wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
- && dpkg -i packages-microsoft-prod.deb \
- && rm packages-microsoft-prod.deb \
- && apt-get update \
- && apt-get -qqy install --no-install-recommends dotnet-sdk-3.1 dotnet-sdk-5.0 dotnet-sdk-6.0 \
- && apt-get -qqy clean; \
- fi
-
-RUN ARCH="$(uname -m)"; \
- if [ "$ARCH" = "aarch64" ]; then \
-    cd /root ; \
+RUN cd /opt ; \
     wget https://dot.net/v1/dotnet-install.sh ; \
-    bash ./dotnet-install.sh --version "3.1.402" --install-dir "$HOME/.dotnet" --architecture "arm64" --os "linux" ; \
-    bash ./dotnet-install.sh --version "5.0.101" --install-dir "$HOME/.dotnet" --architecture "arm64" --os "linux" ;  \
-    bash ./dotnet-install.sh --channel Current ; \
- fi
-ENV PATH $PATH:~/.dotnet
+    bash ./dotnet-install.sh --channel "3.1" --install-dir "/opt/dotnet" ; \
+    bash ./dotnet-install.sh --channel "5.0" --install-dir "/opt/dotnet" ;  \
+    bash ./dotnet-install.sh --channel "6.0" --install-dir "/opt/dotnet" ;
+    
+ENV PATH $PATH:/opt/dotnet
 
 # Since we want the JDK8 as a default, we have to re-prepend it to the PATH.
 RUN update-java-alternatives  -s "java-1.8.0*"