Add dev container config

.devcontainer/devcontainer.json

@@ -0,0 +1,25 @@
+{
+  "name": "Addons-Server Devcontainer",
+  "image": "mcr.microsoft.com/devcontainers/base:bullseye",
+  "workspaceFolder": "/workspaces/addons-server",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/workspaces/addons-server,type=bind",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker": {
+      "version": "latest",
+      "enableNonRootDocker": "true",
+      "moby": "true"
+    }
+  },
+  "forwardPorts": [80],
+  "appPort": [80],
+  "portsAttributes": {
+    "80": {
+      "label": "Addons-Server",
+      "onAutoForward": "notify",
+      "protocol": "http",
+      "requireLocalPort": true,
+      "elevateIfNeeded": true
+    }
+  },
+  "postStartCommand": "make up"
+}

.github/dependabot.yml

@@ -1,5 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
 version: 2
 updates:
+- package-ecosystem: "devcontainers"
+  directory: "/"
+  schedule:
+    interval: weekly
 - package-ecosystem: "npm"
   directory: "/"
   schedule:

.gitignore

@@ -1,4 +1,5 @@
 *.css.tmp
+.devcontainer/*
 *.egg-info
 *.js.tmp
 *.less.css
@@ -53,7 +54,10 @@ tmp/*
 # End of .gitignore. Please keep this in sync with the top section of .dockerignore
 
 # do not ignore the following files
+!.devcontainer/devcontainer.json
+!.devcontainer/docker-compose.yml
+!.devcontainer/Dockerfile
+!deps/.gitkeep
 !docker-compose.private.yml
 !private/README.md
 !storage/.gitignore
-!deps/.gitkeep

docker-compose.yml

@@ -10,7 +10,6 @@ x-env-mapping: &env
     - MEMCACHE_LOCATION=memcached:11211
     - MYSQL_DATABASE=olympia
     - MYSQL_ROOT_PASSWORD=docker
-    - OLYMPIA_SITE_URL=http://olympia.test
     - PYTHONDONTWRITEBYTECODE=1
     - PYTHONUNBUFFERED=1
     - PYTHONBREAKPOINT=ipdb.set_trace
@@ -21,6 +20,7 @@ x-env-mapping: &env
     - HISTCONTROL=erasedups
     - CIRCLECI
     - DATA_BACKUP_SKIP
+    - OLYMPIA_SITE_URL
 
 x-olympia: &olympia
   <<: *env

scripts/setup.py

@@ -86,6 +86,14 @@ def get_olympia_mount(docker_target):
 
     return olympia_mount, olympia_mount_source
 
+def get_olympia_site_url():
+    # In codespaces, we set the site URL to the codespace name port 80
+    # this will map to the nginx service in the devcontainer.
+    if os.environ.get('CODESPACE_NAME'):
+        return f'https://{os.environ.get("CODESPACE_NAME")}-80.githubpreview.dev'
+    # On local hosts, we set the site URL to olympia.test
+    return 'http://olympia.test'
+
 
 # Env file should contain values that are referenced in docker-compose*.yml files
 # so running docker compose commands produce consistent results in terminal and make.
@@ -123,6 +131,7 @@ def main():
     # use a value derived from other stable values.
     debug = os.environ.get('DEBUG', str(False if is_production else True))
     olympia_deps = os.environ.get('OLYMPIA_DEPS', docker_target)
+    olympia_site_url = get_olympia_site_url()
 
     set_env_file(
         {
@@ -140,6 +149,7 @@ def main():
             'HOST_MOUNT_SOURCE': olympia_mount_source,
             'DEBUG': debug,
             'OLYMPIA_DEPS': olympia_deps,
+            'OLYMPIA_SITE_URL': olympia_site_url,
         }
     )