From 12300e72830ad817424cd34a8cf1b59f8762f6d3 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Thu, 24 Aug 2023 21:13:34 +1000 Subject: [PATCH] network-host --- .github/workflows/build-and-publish.yml | 32 ++++++++++++------------- docker/scripts/headless.sh | 1 + 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 933b2e8..c0e29ec 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -23,23 +23,23 @@ jobs: username: ${{ env.REPOSITORY_OWNER }} password: ${{ secrets.GITHUB_TOKEN }} - # - name: Build and Push to GitHub Container Registry - # uses: docker/build-push-action@v4 - # with: - # build-args: | - # DESKTOP_ENVIRONMENT_USER=${{ env.REPOSITORY_OWNER }} - # DESKTOP_ENVIRONMENT_GITHUB_USER=${{ env.REPOSITORY_OWNER }} - # cache-from: type=gha - # cache-to: type=gha,mode=max - # file: docker/Dockerfile - # push: true - # tags: ghcr.io/${{ env.REPOSITORY_OWNER }}/desktop-environment:latest + - name: Build and Push to GitHub Container Registry + uses: docker/build-push-action@v4 + with: + build-args: | + DESKTOP_ENVIRONMENT_USER=${{ env.REPOSITORY_OWNER }} + DESKTOP_ENVIRONMENT_GITHUB_USER=${{ env.REPOSITORY_OWNER }} + cache-from: type=gha + cache-to: type=gha,mode=max + file: docker/Dockerfile + push: true + tags: ghcr.io/${{ env.REPOSITORY_OWNER }}/desktop-environment:latest - # - name: Run desktop environment tests - # run: ./docker/scripts/test-start.sh - # env: - # DESKTOP_ENVIRONMENT_REGISTRY: ghcr.io/${{ env.REPOSITORY_OWNER }} - # continue-on-error: true + - name: Run desktop environment tests + run: ./docker/scripts/test-start.sh + env: + DESKTOP_ENVIRONMENT_REGISTRY: ghcr.io/${{ env.REPOSITORY_OWNER }} + continue-on-error: true - name: Setup tmate session uses: mxschmitt/action-tmate@v3 diff --git a/docker/scripts/headless.sh b/docker/scripts/headless.sh index ccf108c..0361e44 100755 --- a/docker/scripts/headless.sh +++ b/docker/scripts/headless.sh @@ -10,6 +10,7 @@ docker network create $DESKTOP_ENVIRONMENT_DOCKER_NETWORK docker run \ --detach \ --name $DESKTOP_ENVIRONMENT_CONTAINER_IMAGE \ + --network host \ --publish 8080 \ --rm \ $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE \