diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5d59fcf..0181f24 100755 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,8 +7,7 @@ }, "workspaceMount": "", "runArgs": [ - "--volume=${localWorkspaceFolder}:/workspaces/${localWorkspaceFolderBasename}:Z", - "--platform=linux/amd64" + "--volume=${localWorkspaceFolder}:/workspaces/${localWorkspaceFolderBasename}:Z" ], "customizations": { "vscode": { diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 280331e..7d52a43 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -14,9 +14,6 @@ jobs: docker-build: runs-on: ubuntu-latest steps: - - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." - - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!" - - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." - uses: actions/checkout@v3 - uses: docker/setup-buildx-action@v2 - @@ -43,9 +40,6 @@ jobs: runs-on: ubuntu-latest needs: docker-build steps: - - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." - - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!" - - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." - uses: actions/checkout@v3 - uses: docker/setup-buildx-action@v2 - @@ -65,7 +59,6 @@ jobs: run: | docker run \ --rm \ - --platform linux/amd64 \ --workdir /builder/mnt \ -v ${{ github.workspace }}:/builder/mnt \ cproject-builder:latest \ @@ -75,7 +68,6 @@ jobs: run: | docker run \ --rm \ - --platform linux/amd64 \ --workdir /builder/mnt/tests/unittest \ -v ${{ github.workspace }}:/builder/mnt \ cproject-builder:latest \ diff --git a/builder.Dockerfile b/builder.Dockerfile index 0fad747..a6c3395 100644 --- a/builder.Dockerfile +++ b/builder.Dockerfile @@ -2,7 +2,7 @@ ARG base_tag=bullseye ARG base_img=mcr.microsoft.com/vscode/devcontainers/base:dev-${base_tag} # ARG base_img=debian:${base_tag} -FROM --platform=linux/amd64 ${base_img} AS builder-install +FROM ${base_img} AS builder-install # the following shows how to install the latest version of a package. # you can determine the installed version with `apt-cache policy ` and fix diff --git a/makefile b/makefile index 88c2e96..06d561e 100644 --- a/makefile +++ b/makefile @@ -7,7 +7,6 @@ builder-run : docker run \ --rm \ -it \ - --platform linux/amd64 \ --workdir /builder/mnt \ -v .:/builder/mnt \ $(project_name)-builder:latest \