From f3cfce0f77bf6aff8fdd80dd2a7be8c4367744c3 Mon Sep 17 00:00:00 2001 From: Julie Rymer Date: Wed, 17 Apr 2024 15:51:38 +0200 Subject: [PATCH 1/2] add docker compose file to run sandbox locally --- docker-compose.yml | 12 ++++++++++++ docs/source/internals/sandbox.rst | 8 ++++++++ 2 files changed, 20 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000000..08f64b04527 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.8' + +services: + web: + build: . + ports: + - "8080:8080" + volumes: + - ./src:/app/src + environment: + - ALLOWED_HOSTS=localhost,127.0.0.1,0.0.0.0 + tty: true diff --git a/docs/source/internals/sandbox.rst b/docs/source/internals/sandbox.rst index 1d42db0f7e0..ade6ce52f1b 100644 --- a/docs/source/internals/sandbox.rst +++ b/docs/source/internals/sandbox.rst @@ -106,3 +106,11 @@ To run the Oscar sandbox using `Docker`_, run the following commands: $ docker pull oscarcommerce/django-oscar-sandbox $ docker run -p 8080:8080/tcp oscarcommerce/django-oscar-sandbox:latest + +If you want to run locally using docker, you can use docker compose: + +.. code-block:: bash + + $ docker compose up + +In both case, sandbox site is available at http://localhost:8080/ From b2d5386309bcd516aed47b28200ec99940122e2d Mon Sep 17 00:00:00 2001 From: Julie Rymer Date: Tue, 23 Apr 2024 12:33:02 +0200 Subject: [PATCH 2/2] feat: add postgres DB and mount for test files --- docker-compose.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 08f64b04527..9cab920f0c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,32 @@ version: '3.8' services: + db: + image: postgres:latest + ports: + - "5432:5432" + environment: + - POSTGRES_DB=${COMPOSE_PROJECT_NAME} + - POSTGRES_USER=${COMPOSE_PROJECT_NAME}_user + - POSTGRES_PASSWORD=${COMPOSE_PROJECT_NAME}_pwd + volumes: + - postgres:/var/lib/postgresql/data web: build: . ports: - "8080:8080" volumes: - ./src:/app/src + - ./tests:/app/tests environment: - ALLOWED_HOSTS=localhost,127.0.0.1,0.0.0.0 + - DATABASE_ENGINE=django.db.backends.postgresql + - DATABASE_NAME=${COMPOSE_PROJECT_NAME} + - DATABASE_USER=${COMPOSE_PROJECT_NAME}_user + - DATABASE_PASSWORD=${COMPOSE_PROJECT_NAME}_pwd + - DATABASE_HOST=db tty: true + +volumes: + postgres: + name: ${COMPOSE_PROJECT_NAME}_postgres \ No newline at end of file