From 18adb4dfff74c935b7e82fedceb10a8dcc33aa12 Mon Sep 17 00:00:00 2001 From: spenceradolph Date: Mon, 15 Apr 2024 13:04:00 +0000 Subject: [PATCH] combined arm and amd build step --- .github/workflows/docker.yml | 110 +++++++++++++++++------------------ 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2b0a9c5..0c8c33c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -72,7 +72,7 @@ jobs: org.opencontainers.image.source=${{ env.IMAGE_SOURCE }} org.opencontainers.image.description=${{ env.IMAGE_DESCRIPTION }} org.opencontainers.image.licenses=${{ env.IMAGE_LICENSE }} - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 - name: Build and push the server container image (implant) uses: docker/build-push-action@v5 # ref: https://github.com/marketplace/actions/build-and-push-docker-images @@ -88,7 +88,7 @@ jobs: org.opencontainers.image.source=${{ env.IMAGE_SOURCE }} org.opencontainers.image.description=${{ env.IMAGE_DESCRIPTION }} org.opencontainers.image.licenses=${{ env.IMAGE_LICENSE }} - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 update_files: runs-on: ubuntu-latest @@ -143,56 +143,56 @@ jobs: # Have the workflow fail in case there are pathspec issues pathspec_error_handling: exitImmediately - agent_build_arm: - runs-on: ubuntu-latest - permissions: - contents: write - packages: write - steps: - - name: Checkout the repository - uses: actions/checkout@v4 # ref: https://github.com/marketplace/actions/checkout - - name: Log in to the container registry - uses: docker/login-action@v3 # ref: https://github.com/marketplace/actions/docker-login - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: 'arm64,arm' - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - - name: Build and push the server container image (api) - uses: docker/build-push-action@v5 # ref: https://github.com/marketplace/actions/build-and-push-docker-images - with: - context: Payload_Type/sliverapi - file: Payload_Type/sliverapi/Dockerfile - tags: | - ${{ env.REGISTRY }}/mythicagents/sliver:sliverapi.${{ env.VERSION }} - push: ${{ github.ref_type == 'tag' }} - # These container metadata labels allow configuring the package in Github - # packages. The source will link the package to this Github repository - labels: | - org.opencontainers.image.source=${{ env.IMAGE_SOURCE }} - org.opencontainers.image.description=${{ env.IMAGE_DESCRIPTION }} - org.opencontainers.image.licenses=${{ env.IMAGE_LICENSE }} - platforms: linux/arm64 - - - name: Build and push the server container image (implant) - uses: docker/build-push-action@v5 # ref: https://github.com/marketplace/actions/build-and-push-docker-images - with: - context: Payload_Type/sliverimplant - file: Payload_Type/sliverimplant/Dockerfile - tags: | - ${{ env.REGISTRY }}/mythicagents/sliver:sliverimplant.${{ env.VERSION }} - push: ${{ github.ref_type == 'tag' }} - # These container metadata labels allow configuring the package in Github - # packages. The source will link the package to this Github repository - labels: | - org.opencontainers.image.source=${{ env.IMAGE_SOURCE }} - org.opencontainers.image.description=${{ env.IMAGE_DESCRIPTION }} - org.opencontainers.image.licenses=${{ env.IMAGE_LICENSE }} - platforms: linux/arm64 \ No newline at end of file + # agent_build_arm: + # runs-on: ubuntu-latest + # permissions: + # contents: write + # packages: write + # steps: + # - name: Checkout the repository + # uses: actions/checkout@v4 # ref: https://github.com/marketplace/actions/checkout + # - name: Log in to the container registry + # uses: docker/login-action@v3 # ref: https://github.com/marketplace/actions/docker-login + # with: + # registry: ${{ env.REGISTRY }} + # username: ${{ github.actor }} + # password: ${{ secrets.GITHUB_TOKEN }} + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v2 + # with: + # platforms: 'arm64,arm' + # - name: Set up Docker Buildx + # id: buildx + # uses: docker/setup-buildx-action@v2 + + # - name: Build and push the server container image (api) + # uses: docker/build-push-action@v5 # ref: https://github.com/marketplace/actions/build-and-push-docker-images + # with: + # context: Payload_Type/sliverapi + # file: Payload_Type/sliverapi/Dockerfile + # tags: | + # ${{ env.REGISTRY }}/mythicagents/sliver:sliverapi.${{ env.VERSION }} + # push: ${{ github.ref_type == 'tag' }} + # # These container metadata labels allow configuring the package in Github + # # packages. The source will link the package to this Github repository + # labels: | + # org.opencontainers.image.source=${{ env.IMAGE_SOURCE }} + # org.opencontainers.image.description=${{ env.IMAGE_DESCRIPTION }} + # org.opencontainers.image.licenses=${{ env.IMAGE_LICENSE }} + # platforms: linux/arm64 + + # - name: Build and push the server container image (implant) + # uses: docker/build-push-action@v5 # ref: https://github.com/marketplace/actions/build-and-push-docker-images + # with: + # context: Payload_Type/sliverimplant + # file: Payload_Type/sliverimplant/Dockerfile + # tags: | + # ${{ env.REGISTRY }}/mythicagents/sliver:sliverimplant.${{ env.VERSION }} + # push: ${{ github.ref_type == 'tag' }} + # # These container metadata labels allow configuring the package in Github + # # packages. The source will link the package to this Github repository + # labels: | + # org.opencontainers.image.source=${{ env.IMAGE_SOURCE }} + # org.opencontainers.image.description=${{ env.IMAGE_DESCRIPTION }} + # org.opencontainers.image.licenses=${{ env.IMAGE_LICENSE }} + # platforms: linux/arm64 \ No newline at end of file