Move BrowserTests.Dockerfile to browser-tests/Dockerfile

mozilla · Feb 21, 2025 · 3610815 · 3610815
1 parent a0339df
commit 3610815
Show file tree

Hide file tree

Showing 8 changed files with 1,771 additions and 862 deletions.
diff --git a/.gitignore b/.gitignore
@@ -68,7 +68,6 @@ target/
 
 # misc
 autograph-certs/chains
-tests/pyproject.toml
 mail/*.eml
 attachments/
 .DS_Store

diff --git a/BrowserTests.dockerignore → browser-tests/.dockerignore b/BrowserTests.dockerignore → browser-tests/.dockerignore
diff --git a/BrowserTests.Dockerfile → browser-tests/Dockerfile b/BrowserTests.Dockerfile → browser-tests/Dockerfile
@@ -16,7 +16,7 @@ RUN python -m venv $POETRY_HOME && \
 
 WORKDIR /opt
 COPY pyproject.toml poetry.lock ./
-RUN $POETRY_HOME/bin/poetry install --only browser-tests --no-root
+RUN $POETRY_HOME/bin/poetry install --no-root
 
 FROM python:3.13.2
 
@@ -25,14 +25,12 @@ ENV PATH="/opt/.venv/bin:$PATH" \
     VIRTUAL_ENV=/opt/.venv \
     PYTHONPATH="/app:$PYTHONPATH"
 
-COPY /bin/update_and_install_system_packages.sh /opt
-RUN /opt/update_and_install_system_packages.sh wget
+RUN apt-get update && apt-get -y install wget
 
 COPY --from=build $VIRTUAL_ENV $VIRTUAL_ENV
 
 RUN playwright install --with-deps firefox
 
 WORKDIR /app
-COPY browser-tests/ pyproject.toml ./
-# ./browser-tests/run.sh, not ./bin/run.sh
+COPY . .
 ENTRYPOINT ["/app/run.sh"]
diff --git a/browser-tests/poetry.lock b/browser-tests/poetry.lock
diff --git a/browser-tests/pyproject.toml b/browser-tests/pyproject.toml
@@ -0,0 +1,17 @@
+[tool.poetry]
+name = "browser-tests"
+version = "0"
+description = "Browser tests"
+authors = ["Contactless <postmaster@localhost>"]
+
+[tool.poetry.dependencies]
+python = ">=3.11, <3.14"
+aiohttp = "3.11.12"
+autograph-utils = "1.0.1"
+canonicaljson-rs = "0.7.1"
+httpie = "3.2.4"
+kinto-http = "11.7.1"
+pytest = "8.3.4"
+webtest = "3.0.4"
+playwright = "1.50.0"
+pytest-playwright = "0.7.0"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -53,8 +53,7 @@ services:
 
   browser-tests:
     build:
-      dockerfile: BrowserTests.Dockerfile
-      context: .
+      context: browser-tests/
     image: remotesettings/browser-tests
     profiles: [browser-tests]
     depends_on:

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -90,20 +90,6 @@ coverage = "7.6.12"
 detect-secrets = "^1.5.0"
 ruff = "^0.9.6"
 
-[tool.poetry.group.browser-tests]
-optional = true
-
-[tool.poetry.group.browser-tests.dependencies]
-aiohttp = "3.11.12"
-autograph-utils = "1.0.1"
-canonicaljson-rs = "0.7.1"
-httpie = "3.2.4"
-kinto-http = "11.7.1"
-pytest = "8.3.4"
-webtest = "3.0.4"
-playwright = "1.50.0"
-pytest-playwright = "0.7.0"
-
 [tool.poetry.group.docs]
 optional = true