[pull] master from mozilla:master

.dockerignore

@@ -1,8 +1,63 @@
-.env
-.git
+# Copy of .gitignore please keep these in sync
+*.css.tmp
+*.egg-info
+*.js.tmp
+*.less.css
+*.mo
+*.po~
+*.py[co]
+*.signed.zip
+*.styl.css
+*-all.css
+*-all.js
+*-min.css
+*-min.js
+.*.sw?
 .cache
-.tox
-deps/
-node_modules/
-storage/
-logs/*
+.DS_Store
+.env
+.ipython
+.mysql_history
+.nose*
+.npm/
+.pdbhistory
+.pytest_cache
+.ssh
+.tox/
+.vscode
+backups
+build*.py
+buildx-bake-metadata.json
+deps/*
+docker*.yml
+docker/artifacts/*
+docs/_build
+docs/_gh-pages
+docs/api/_build
+local_settings.py
+MANIFEST
+node_modules
+pip-log.txt
+private/
+.ruff_cache
+settings_local.py*
+settings_local_*.py
+shellng_local.py
+site-static/*
+src/olympia/discovery/strings.jinja2
+static-build/*
+static/css/node_lib/*
+static/js/node_lib/*
+storage
+tmp/*
+
+# Additionally ignore these files from the docker build that are not in .gitignore
+
+.dockerignore
+.github
+docs
+private
+docker-bake.hcl
+docker-compose*.yml
+Dockerfile*
+Makefile-os

.github/CONTRIBUTING.md

@@ -0,0 +1,29 @@
+(contributing)=
+
+# Contributing
+
+If you're not sure this is the correct place to file an issue
+then please file an issue on the [mozilla/addons] project instead.
+
+Before contributing code, please note:
+
+- You agree to license your contributions under the [license].
+- Please ask on the [dev-addons mailing list] before submitting
+  pull-requests for new features or large changes that are not related to
+  existing issues.
+- Follow [PEP8], [jshint] and our other [style guide conventions].
+- Please write tests and read the docs on [addons-server].
+
+Ready to get started? Follow [these steps](https://wiki.mozilla.org/Add-ons/Contribute/Code).
+
+**Note to staff:** If you come across a potential "good first bug" for contributors, please tag it with "**maybe good first bug**". The community team [triages](https://wiki.mozilla.org/Add-ons/Contribute/Goodfirstbugs_triage) these every other week to ensure they have mentors assigned, onboarding information, and basic steps to get started. This gives new contributors a better experience when they pick a "good first bug" to work on.
+
+Thank you for contributing!
+
+[addons-server]: https://addons-server.readthedocs.io/en/latest/
+[dev-addons mailing list]: https://mail.mozilla.org/listinfo/dev-addons
+[jshint]: http://www.jshint.com/
+[license]: https://github.com/mozilla/addons-server/blob/master/LICENSE
+[mozilla/addons]: https://github.com/mozilla/addons/issues/new
+[pep8]: https://www.python.org/dev/peps/pep-0008/
+[style guide conventions]: https://mozweb.readthedocs.io/en/latest/

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,43 @@
+Fixes: mozilla/addons#ISSUENUM
+
+<!--
 Thanks for opening a Pull Request (PR), here's a few guidelines as to what we need in your PR before we review it.
+-->
+
+### Description
+
+<!--
+Your PR will be squashed when merged so the 1st commit must contain a descriptive and concise summary of the change.
+Additional details should be added in the description. If your change is simple enough to summarize in the commit, or
+if it is not relevant for your PR, remove this section.
+-->
+
+### Context
+
+<!--
+Often a pull request contains changes that are not fully self explanatory. Maybe this PR is a part of a series,
+or maybe it is a partial change now with a more ambitious plan for the future. Add this additional context here.
+If it is not relevant for your PR, remove this section.
+-->
+
+### Testing
+
+<!--
+Your change must be related to an existing, open issue. This issue should contain testing instructions.
+Often, the testing info in the issue is higher level, geared towards a user or QA experience.
+Here you can provide information for a developer verifying this PR. Get technical.
+If it is not relevant to your PR, remove this section.
+-->
+
+### Checklist
 
+<!--
+Here's a few guidelines as to what we need in your PR before we review it.
 Please delete anything that isn't relevant to your patch.
+-->
 
-* [ ] This PR relates to an existing open issue and there are no existing
-      PRs open for the same issue.
-* [ ] Add `Fixes #ISSUENUM` at the top of your PR.
-* [ ] Add a description of the changes introduced in this PR.
-* [ ] The change has been successfully run locally.
-* [ ] Add tests to cover the changes added in this PR.
-* [ ] Add before and after screenshots (Only for changes that impact the UI).
-
-Once you have met the above requirements please replace this section with
-a `Fixes #ISSUENUM` linking to the issue fixed by this PR along with an
-explanation of the changes. Thanks for your contribution!
+- [ ] Add `#ISSUENUM` at the top of your PR to an existing open issue in the mozilla/addons repository.
+- [ ] Successfully verified the change locally.
+- [ ] The change is covered by automated tests, or otherwise indicated why doing so is unnecessary/impossible.
+- [ ] Add before and after screenshots (Only for changes that impact the UI).
+- [ ] Add or update relevant [docs](../docs/) reflecting the changes made.

.github/actions/build-docker/action.yml

@@ -0,0 +1,83 @@
+name: 'Docker Build Action'
+description: 'Build the docker image'
+inputs:
+  registry:
+    required: true
+    description: The registry to tag the image with
+  image:
+    required: true
+    description: The image to tag the image with
+  version:
+    required: true
+    description: The image version to tag with
+  push:
+    required: false
+    description: Push the image?
+    default: 'false'
+
+outputs:
+  tag:
+    description: The docker tag of the built image
+    value: ${{ steps.build_meta.outputs.tag }}
+  version:
+    description: The docker version of the built image
+    value: ${{ steps.meta.outputs.version }}
+  digest:
+    description: The docker build digest of the built image
+    value: ${{ steps.build_meta.outputs.digest }}
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Context
+      id: context
+      shell: bash
+      run: |
+        git_repo_url="${{ github.server_url }}/${{ github.repository }}"
+
+        echo "git_build_url=$git_repo_url/actions/runs/${{ github.run_id }}" >> $GITHUB_OUTPUT
+        echo "git_sha=${{ github.sha }}" >> $GITHUB_OUTPUT
+
+        cat $GITHUB_OUTPUT
+
+    - name: Docker meta
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        bake-target: web
+        images: ${{ inputs.registry }}/${{ inputs.image }}
+        tags: |
+          # use raw tag to allow the calling workflow to define the version of the image
+          # and to prevent multiple tags from being associated with a build
+          type=raw,value=${{ inputs.version }}
+
+    - name: Create .env and version.json files
+      shell: bash
+      run: |
+        # We only build the production image in CI
+        echo "DOCKER_TARGET=production" >> $GITHUB_ENV
+        echo "DOCKER_VERSION=${{ steps.meta.outputs.version }}" >> $GITHUB_ENV
+        echo "DOCKER_COMMIT=${{ steps.context.outputs.git_sha }}" >> $GITHUB_ENV
+        echo "DOCKER_BUILD=${{ steps.context.outputs.git_build_url }}" >> $GITHUB_ENV
+        echo "TAGS_FILE=${{ steps.meta.outputs.bake-file-tags }}" >> $GITHUB_ENV
+        echo "ANNOTATIONS_FILE=${{ steps.meta.outputs.bake-file-annotations }}" >> $GITHUB_ENV
+        echo "DOCKER_METADATA_FILE=buildx-bake-metadata.json" >> $GITHUB_ENV
+
+        make setup
+
+    - name: Build Image
+      id: build
+      shell: bash
+      run: |
+        make docker_build_web \
+          ARGS="--file ${{ env.TAGS_FILE }} --file ${{ env.ANNOTATIONS_FILE }}" \
+          DOCKER_PUSH=${{ inputs.push }}
+
+    - name: Get image digest
+      id: build_meta
+      shell: bash
+      run: |
+        metadata=$(cat $DOCKER_METADATA_FILE)
+        echo "digest=$(echo $metadata | jq -r '.web."containerimage.digest"')" >> $GITHUB_OUTPUT
+        echo "tag=$(echo $metadata | jq -r '.web."image.name"')" >> $GITHUB_OUTPUT
+