diff --git a/Dockerfile b/Dockerfile index f129b37..ff9e36a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,11 +13,6 @@ RUN echo docker_cross_compiler > /etc/hostname RUN apt-get update RUN apt-get install -y sudo wget - # Add the .NET package repository to the repository listing. - RUN wget https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb -O packages-microsoft-prod.deb - RUN dpkg -i packages-microsoft-prod.deb - RUN rm packages-microsoft-prod.deb - # APT dependencies. RUN apt-get update RUN apt-get install -y \ @@ -27,8 +22,6 @@ RUN echo docker_cross_compiler > /etc/hostname clang \ cpio \ curl \ - dotnet-sdk-8.0 \ - dotnet-sdk-10.0 \ gcc-arm-linux-gnueabihf \ gcc-aarch64-linux-gnu \ gcc-i686-linux-gnu \ @@ -51,17 +44,18 @@ RUN echo docker_cross_compiler > /etc/hostname zlib1g-dev # Install dotnet 6.0 even if Micro$lop doesn't support it :P - COPY share/dotnet6.0 /root/dotnet6.0 - RUN dpkg -Ri /root/dotnet6.0 - RUN apt install -fy - - # In the future, we will uncomment these lines for dotnet 8.0. - # COPY share/dotnet8.0 /root/dotnet8.0 - # RUN dpkg -Ri /root/dotnet8.0 - # RUN apt install -fy + WORKDIR /root/ + COPY share/*.tar.gz /root/ + RUN mkdir -p /usr/lib64/dotnet + WORKDIR /usr/lib64/dotnet + RUN tar -zxf /root/dotnet-sdk-6.0.428-linux-x64.tar.gz + RUN tar -zxf /root/dotnet-sdk-8.0.421-linux-x64.tar.gz + RUN tar -zxf /root/dotnet-sdk-10.0.300-linux-x64.tar.gz + RUN ln -s /usr/lib64/dotnet/dotnet /usr/local/bin/dotnet # Clone osxcross # Let's do this later. + WORKDIR /root/ RUN git clone --recurse-submodules "https://github.com/tpoechtrager/osxcross.git" osxcross # Download packaged SDK from this random github (very safe i know) @@ -80,11 +74,10 @@ RUN echo docker_cross_compiler > /etc/hostname RUN adduser --comment "" --disabled-password refuel RUN addgroup wheel RUN usermod -aG wheel refuel - USER refuel + USER refuel WORKDIR /home/refuel # Copy bashrc - RUN cp /etc/bash.bashrc ~/.bashrc COPY sh/bashrc.sh /home/refuel/.bashrc # Execute an interactive shell. diff --git a/sh/bashrc.sh b/sh/bashrc.sh old mode 100644 new mode 100755 index 5f51e99..17a2d1c --- a/sh/bashrc.sh +++ b/sh/bashrc.sh @@ -1,4 +1,22 @@ +source /etc/bash.bashrc + +# Set location for AppHost lookup +[ -z "$DOTNET_ROOT" ] && export DOTNET_ROOT=/usr/lib64/dotnet + +# Add dotnet tools directory to PATH +DOTNET_TOOLS_PATH="$HOME/.dotnet/tools" +case "$PATH" in + *"$DOTNET_TOOLS_PATH"* ) true ;; + * ) PATH="$PATH:$DOTNET_TOOLS_PATH" ;; +esac + +# Extract self-contained executables under HOME +# to avoid multi-user issues from using the default '/var/tmp'. +[ -z "$DOTNET_BUNDLE_EXTRACT_BASE_DIR" ] && export DOTNET_BUNDLE_EXTRACT_BASE_DIR="${XDG_CACHE_HOME:-"$HOME"/.cache}/dotnet_bundle_extract" + + echo ReFuel Project - Copyright \(C\) 2023 echo echo This is an interactive shell for ReFuel build image. echo SuperUser \(su/sudo\) commands are enabled without a password. Beware. + diff --git a/sh/init.sh b/sh/init.sh old mode 100644 new mode 100755 diff --git a/sh/publish.sh b/sh/publish.sh old mode 100644 new mode 100755 diff --git a/share/dotnet-sdk-10.0.300-linux-x64.tar.gz b/share/dotnet-sdk-10.0.300-linux-x64.tar.gz new file mode 100644 index 0000000..2889ad0 Binary files /dev/null and b/share/dotnet-sdk-10.0.300-linux-x64.tar.gz differ diff --git a/share/dotnet8.0/dotnet-sdk-8.0_8.0.303-1_amd64.deb b/share/dotnet-sdk-6.0.428-linux-x64.tar.gz similarity index 56% rename from share/dotnet8.0/dotnet-sdk-8.0_8.0.303-1_amd64.deb rename to share/dotnet-sdk-6.0.428-linux-x64.tar.gz index 2c0517a..a0ab4d5 100644 Binary files a/share/dotnet8.0/dotnet-sdk-8.0_8.0.303-1_amd64.deb and b/share/dotnet-sdk-6.0.428-linux-x64.tar.gz differ diff --git a/share/dotnet-sdk-8.0.421-linux-x64.tar.gz b/share/dotnet-sdk-8.0.421-linux-x64.tar.gz new file mode 100644 index 0000000..6ffedc9 Binary files /dev/null and b/share/dotnet-sdk-8.0.421-linux-x64.tar.gz differ diff --git a/share/dotnet6.0/aspnetcore-runtime-6.0_6.0.32-1_amd64.deb b/share/dotnet6.0/aspnetcore-runtime-6.0_6.0.32-1_amd64.deb deleted file mode 100644 index ee38308..0000000 Binary files a/share/dotnet6.0/aspnetcore-runtime-6.0_6.0.32-1_amd64.deb and /dev/null differ diff --git a/share/dotnet6.0/aspnetcore-targeting-pack-6.0_6.0.32-1_amd64.deb b/share/dotnet6.0/aspnetcore-targeting-pack-6.0_6.0.32-1_amd64.deb deleted file mode 100644 index 40656d7..0000000 Binary files a/share/dotnet6.0/aspnetcore-targeting-pack-6.0_6.0.32-1_amd64.deb and /dev/null differ diff --git a/share/dotnet6.0/dotnet-apphost-pack-6.0_6.0.32-1_amd64.deb b/share/dotnet6.0/dotnet-apphost-pack-6.0_6.0.32-1_amd64.deb deleted file mode 100644 index 56cc8e7..0000000 Binary files a/share/dotnet6.0/dotnet-apphost-pack-6.0_6.0.32-1_amd64.deb and /dev/null differ diff --git a/share/dotnet6.0/dotnet-hostfxr-6.0_6.0.32-1_amd64.deb b/share/dotnet6.0/dotnet-hostfxr-6.0_6.0.32-1_amd64.deb deleted file mode 100644 index 0aaf9d6..0000000 Binary files a/share/dotnet6.0/dotnet-hostfxr-6.0_6.0.32-1_amd64.deb and /dev/null differ diff --git a/share/dotnet6.0/dotnet-runtime-6.0_6.0.32-1_amd64.deb b/share/dotnet6.0/dotnet-runtime-6.0_6.0.32-1_amd64.deb deleted file mode 100644 index fc4975d..0000000 Binary files a/share/dotnet6.0/dotnet-runtime-6.0_6.0.32-1_amd64.deb and /dev/null differ diff --git a/share/dotnet6.0/dotnet-runtime-deps-6.0_6.0.32-1_amd64.deb b/share/dotnet6.0/dotnet-runtime-deps-6.0_6.0.32-1_amd64.deb deleted file mode 100644 index 3a82985..0000000 Binary files a/share/dotnet6.0/dotnet-runtime-deps-6.0_6.0.32-1_amd64.deb and /dev/null differ diff --git a/share/dotnet6.0/dotnet-sdk-6.0_6.0.424-1_amd64.deb b/share/dotnet6.0/dotnet-sdk-6.0_6.0.424-1_amd64.deb deleted file mode 100644 index b17aaeb..0000000 Binary files a/share/dotnet6.0/dotnet-sdk-6.0_6.0.424-1_amd64.deb and /dev/null differ diff --git a/share/dotnet6.0/dotnet-targeting-pack-6.0_6.0.32-1_amd64.deb b/share/dotnet6.0/dotnet-targeting-pack-6.0_6.0.32-1_amd64.deb deleted file mode 100644 index 8c0114a..0000000 Binary files a/share/dotnet6.0/dotnet-targeting-pack-6.0_6.0.32-1_amd64.deb and /dev/null differ diff --git a/share/dotnet6.0/netstandard-targeting-pack-2.1_2.1.0-1_amd64.deb b/share/dotnet6.0/netstandard-targeting-pack-2.1_2.1.0-1_amd64.deb deleted file mode 100644 index c3fcf6e..0000000 Binary files a/share/dotnet6.0/netstandard-targeting-pack-2.1_2.1.0-1_amd64.deb and /dev/null differ diff --git a/share/dotnet8.0/aspnetcore-runtime-8.0_8.0.7-1_amd64.deb b/share/dotnet8.0/aspnetcore-runtime-8.0_8.0.7-1_amd64.deb deleted file mode 100644 index 620c7a6..0000000 Binary files a/share/dotnet8.0/aspnetcore-runtime-8.0_8.0.7-1_amd64.deb and /dev/null differ diff --git a/share/dotnet8.0/aspnetcore-targeting-pack-8.0_8.0.7-1_amd64.deb b/share/dotnet8.0/aspnetcore-targeting-pack-8.0_8.0.7-1_amd64.deb deleted file mode 100644 index a2c08fa..0000000 Binary files a/share/dotnet8.0/aspnetcore-targeting-pack-8.0_8.0.7-1_amd64.deb and /dev/null differ diff --git a/share/dotnet8.0/dotnet-apphost-pack-8.0_8.0.7-1_amd64.deb b/share/dotnet8.0/dotnet-apphost-pack-8.0_8.0.7-1_amd64.deb deleted file mode 100644 index 554b496..0000000 Binary files a/share/dotnet8.0/dotnet-apphost-pack-8.0_8.0.7-1_amd64.deb and /dev/null differ diff --git a/share/dotnet8.0/dotnet-host_8.0.7-1_amd64.deb b/share/dotnet8.0/dotnet-host_8.0.7-1_amd64.deb deleted file mode 100644 index 18cc9b9..0000000 Binary files a/share/dotnet8.0/dotnet-host_8.0.7-1_amd64.deb and /dev/null differ diff --git a/share/dotnet8.0/dotnet-hostfxr-8.0_8.0.7-1_amd64.deb b/share/dotnet8.0/dotnet-hostfxr-8.0_8.0.7-1_amd64.deb deleted file mode 100644 index 7124c19..0000000 Binary files a/share/dotnet8.0/dotnet-hostfxr-8.0_8.0.7-1_amd64.deb and /dev/null differ diff --git a/share/dotnet8.0/dotnet-runtime-8.0_8.0.7-1_amd64.deb b/share/dotnet8.0/dotnet-runtime-8.0_8.0.7-1_amd64.deb deleted file mode 100644 index 98ef8a3..0000000 Binary files a/share/dotnet8.0/dotnet-runtime-8.0_8.0.7-1_amd64.deb and /dev/null differ diff --git a/share/dotnet8.0/dotnet-runtime-deps-8.0_8.0.7-1_amd64.deb b/share/dotnet8.0/dotnet-runtime-deps-8.0_8.0.7-1_amd64.deb deleted file mode 100644 index c163ddd..0000000 Binary files a/share/dotnet8.0/dotnet-runtime-deps-8.0_8.0.7-1_amd64.deb and /dev/null differ diff --git a/share/dotnet8.0/dotnet-targeting-pack-8.0_8.0.7-1_amd64.deb b/share/dotnet8.0/dotnet-targeting-pack-8.0_8.0.7-1_amd64.deb deleted file mode 100644 index 418f451..0000000 Binary files a/share/dotnet8.0/dotnet-targeting-pack-8.0_8.0.7-1_amd64.deb and /dev/null differ