From 890f21bf4711408424b727b4db8bf9391ca86457 Mon Sep 17 00:00:00 2001 From: Xe Iaso Date: Sat, 5 Jul 2025 04:53:45 +0000 Subject: [PATCH] chore(devcontainer): move playwright to its own devcontainer service (#756) Signed-off-by: Xe Iaso --- .devcontainer/Dockerfile | 4 +-- .devcontainer/devcontainer.json | 8 ----- .devcontainer/docker-compose.yaml | 11 +++++-- .github/workflows/devcontainer.yml | 47 ------------------------------ 4 files changed, 10 insertions(+), 60 deletions(-) delete mode 100644 .github/workflows/devcontainer.yml diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3f74f13..774a255 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,9 +3,7 @@ FROM ghcr.io/xe/devcontainer-base/pre/go WORKDIR /app COPY go.mod go.sum package.json package-lock.json ./ -RUN go install github.com/a-h/templ/cmd/templ \ - && npx --yes playwright@1.52.0 install --with-deps\ - && apt-get update \ +RUN apt-get update \ && apt-get -y install zstd brotli redis \ && mkdir -p /home/vscode/.local/share/fish \ && chown -R vscode:vscode /home/vscode/.local/share/fish \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c1481fd..3cb776d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,14 +2,6 @@ // README at: https://github.com/devcontainers/templates/tree/main/src/debian { "name": "Dev", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - // "build": { - // "dockerfile": "./Dockerfile", - // "context": "..", - // "cacheFrom": [ - // "type=registry,ref=ghcr.io/techarohq/anubis/devcontainer" - // ] - // }, "dockerComposeFile": ["./docker-compose.yaml"], "service": "workspace", "workspaceFolder": "/workspace/anubis", diff --git a/.devcontainer/docker-compose.yaml b/.devcontainer/docker-compose.yaml index 4a59578..d2fbc3b 100644 --- a/.devcontainer/docker-compose.yaml +++ b/.devcontainer/docker-compose.yaml @@ -1,4 +1,13 @@ services: + playwright: + image: mcr.microsoft.com/playwright:v1.52.0-noble + init: true + network_mode: service:workspace + command: + - /bin/sh + - -c + - npx -y playwright@1.52.0 run-server --port 9001 --host 0.0.0.0 + valkey: image: valkey/valkey:8 pull_policy: always @@ -9,8 +18,6 @@ services: build: context: .. dockerfile: .devcontainer/Dockerfile - cache_from: - - "type=registry,ref=ghcr.io/techarohq/anubis/devcontainer" volumes: - ../:/workspace/anubis:cached environment: diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml deleted file mode 100644 index 6b70a59..0000000 --- a/.github/workflows/devcontainer.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Dev container prebuild - -on: - push: - branches: ["main"] - tags: ["v*.*.*"] - -jobs: - devcontainer: - runs-on: ubuntu-24.04 - steps: - - name: Checkout code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - fetch-tags: true - fetch-depth: 0 - persist-credentials: false - - - name: Set up QEMU - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1 - - - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0 - with: - node-version: latest - - - run: | - sudo apt-get update - sudo apt-get -y install skopeo - - - name: Log into registry - if: github.event_name != 'pull_request' - uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0 - with: - registry: ghcr.io - username: techarohq - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Pre-build dev container image - uses: devcontainers/ci@8bf61b26e9c3a98f69cb6ce2f88d24ff59b785c6 # v0.3.1900000417 - with: - imageName: ghcr.io/techarohq/anubis/devcontainer - cacheFrom: ghcr.io/techarohq/anubis/devcontainer - push: always - platform: linux/amd64,linux/arm64