diff --git a/.github/workflows/publish-anybodycon.yml b/.github/workflows/publish-anybodycon.yml index f8517d2..d19ff0a 100644 --- a/.github/workflows/publish-anybodycon.yml +++ b/.github/workflows/publish-anybodycon.yml @@ -11,7 +11,7 @@ on: env: ANYBODY_VERSION: "8.1" - ANYBODY_VERSION_PATCH: "0" + ANYBODY_VERSION_PATCH: "3" ANYBODY_BETA_SUFFIX: "" ANYBODY_RC_SUFFIX: "" BUILD_NUMBER: 0 @@ -75,75 +75,6 @@ jobs: org.opencontainers.image.licenses="https://www.anybodytech.com/legal/software-license-agreement/" - create-anybodycon-devcontainer-image: - name: AnyBodyCon DevContainer image - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - - steps: - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v4 - with: - images: | - anybody/anybodycon-devcontainer - ghcr.io/anybody/anybodycon-devcontainer - - - name: Log in to the Container registry - if: ${{ github.event_name != 'pull_request' }} - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Clear up some disk space - run: | - sudo rm -rf "/usr/local/share/boost" - sudo rm -rf "/usr/local/share/boost" - sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - - - name: Build and push AnyBodyCon devcontainer image - uses: docker/build-push-action@v4 - with: - file: Dockerfile-anybodycon - push: ${{ github.event_name != 'pull_request' }} - cache-from: type=gha, scope=${{ github.workflow }} - cache-to: type=gha, scope=${{ github.workflow }} - build-args: | - ANYBODY_VERSION=${{ env.ANYBODY_VERSION }} - ANYBODY_VERSION_PATCH=${{ env.ANYBODY_VERSION_PATCH }} - ANYBODY_BETA_SUFFIX=${{ env.ANYBODY_BETA_SUFFIX }} - ANYBODY_RC_SUFFIX=${{ env.ANYBODY_RC_SUFFIX }} - BASE_IMAGE=mcr.microsoft.com/vscode/devcontainers/miniconda - DISTRO=debian - DISTRO_VERSION=bullseye - TAG=0.202.3-3 - USERNAME=vscode - USER_UID=1000 - USER_GID=1000 - tags: | - ghcr.io/anybody/anybodycon-devcontainer:${{ env.ANYBODY_VERSION }}.${{ env.ANYBODY_VERSION_PATCH }}${{ env.ANYBODY_BETA_SUFFIX }}${{ env.ANYBODY_RC_SUFFIX }}-${{ env.BUILD_NUMBER }} - ghcr.io/anybody/anybodycon-devcontainer:${{ env.ANYBODY_VERSION }}.${{ env.ANYBODY_VERSION_PATCH }}${{ env.ANYBODY_BETA_SUFFIX }}${{ env.ANYBODY_RC_SUFFIX }} - ghcr.io/anybody/anybodycon-devcontainer:${{ env.ANYBODY_VERSION }}${{ env.ANYBODY_BETA_SUFFIX }}${{ env.ANYBODY_RC_SUFFIX }} - ghcr.io/anybody/anybodycon-devcontainer:latest${{ env.ANYBODY_BETA_SUFFIX }}${{ env.ANYBODY_RC_SUFFIX }} - labels: | - org.opencontainers.image.title="anybodycon-devcontainer" - org.opencontainers.image.description="This is the slim anybodycon image configured for Development Containers, like for example GitHub Codespaces and similar services" - org.opencontainers.image.version="${{ env.ANYBODY_VERSION }}.${{ env.ANYBODY_VERSION_PATCH }}${{ env.ANYBODY_BETA_SUFFIX }}${{ env.ANYBODY_RC_SUFFIX }}" - org.opencontainers.image.url="https://github.com/AnyBody/anybody-container/pkgs/container/anybodycon-devcontainer" - org.opencontainers.image.licenses="https://www.anybodytech.com/legal/software-license-agreement/" - - - create-github-actions-image: diff --git a/Dockerfile-anybodycon b/Dockerfile-anybodycon index c34d901..532300e 100644 --- a/Dockerfile-anybodycon +++ b/Dockerfile-anybodycon @@ -176,6 +176,12 @@ COPY --from=build-base /usr/share/keyrings/winehq-archive.key /usr/share/keyring && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +# Install winetricks and use it to install vcrun2019 for native ucrtbase.dll +RUN apt-get update && apt-get install -y --no-install-recommends winetricks \ + && winetricks -q vcrun2019 \ + && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + + ENV PATH="/opt/wine-${WINECHANNEL}/bin:${PATH}" RUN mkdir -p /wine && chown -R $USER_UID:$USER_GID /wine && \