From 44ad453cce76e0df2fb9db3aa5b0c98afb07c61b Mon Sep 17 00:00:00 2001 From: soup-bowl Date: Fri, 27 Dec 2024 22:25:53 +0000 Subject: [PATCH] Remove dotnet6 --- .github/workflows/build-beta.yml | 4 ---- README.md | 4 +--- beta/source/Dockerfile.dotnet6 | 34 -------------------------------- 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 beta/source/Dockerfile.dotnet6 diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index 1dbd2b7..0fe58bf 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -24,10 +24,6 @@ jobs: folder: beta/source file: Dockerfile platforms: linux/amd64 - - tag: dotnet6 - folder: beta/source - file: Dockerfile.dotnet6 - platforms: linux/amd64,linux/arm64 steps: - name: Checkout Codebase diff --git a/README.md b/README.md index d4c734d..7f5e0b2 100644 --- a/README.md +++ b/README.md @@ -123,9 +123,7 @@ A bleeding edge variant using **Alpine** as the build image. Progress can be tra ## `soupbowl/opensimulator:source` -Gets the latest available code from the OpenSimulator repository, and constructs a bleeding edge container. Configuration is not different, but this is **compiled from source** and should be **treated as highly unstable**. These are built **4 times daily**, providing a change has occurred. - -**Note**: This was originally building from the `dotnet6` branch of the OpenSimulator repository. This image is now truly built from source, but if you want to use the original-type image, it is now built to the container tag `dotnet6`. +Gets the latest available code from the OpenSimulator repository, and constructs a bleeding edge container. Configuration is not different, but this is **compiled from source** and should be **treated as highly unstable**. These are built **on demand**, when a detected changre has occurred. # Source Code diff --git a/beta/source/Dockerfile.dotnet6 b/beta/source/Dockerfile.dotnet6 deleted file mode 100644 index a1d29eb..0000000 --- a/beta/source/Dockerfile.dotnet6 +++ /dev/null @@ -1,34 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build - -# Cache Bust to avoid caching skipping the latest commit -ADD https://api.github.com/repos/opensim/opensim/git/refs/heads/dotnet6 version.json -RUN git clone https://github.com/opensim/opensim.git /app -WORKDIR /app -RUN git checkout dotnet6 - -RUN ./runprebuild.sh && ./compile.sh - -RUN rm bin/config-include/storage/SQLiteStandalone.ini - -FROM mcr.microsoft.com/dotnet/runtime:6.0 - -LABEL org.opencontainers.image.title="OpenSimulator (unofficial)" -LABEL org.opencontainers.image.authors="code@soupbowl.io" -LABEL org.opencontainers.image.source="https://github.com/soup-bowl/opensimulator-docker" -LABEL org.opencontainers.image.licenses="MIT" - -RUN apt-get update && apt-get install -y apt-utils libc6-dev libgdiplus libsqlite3-dev screen uuid-runtime \ - && apt-get clean - -COPY --from=build /app /opt/opensim - -COPY defaults /opt/opensim/bin/defaults - -EXPOSE 9000 - -WORKDIR /opt/opensim/bin - -COPY docker-entrypoint.sh /usr/local/bin/ - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD [ "screen", "-S", "OpenSim", "-D", "-m", "sh", "./opensim.sh" ]