Merge branch 'master' of github.com:google/osv.dev into feat-gitter

Author: Ly-Joey

deployment/clouddeploy/gke-workers/base/gitter.yaml

@@ -32,6 +32,8 @@ spec:
         env:
         - name: GOMEMLIMIT
           value: "100GiB"
+        - name: LOG_LEVEL
+          value: "debug"
         volumeMounts:
         - mountPath: /work
           name: disk-data

deployment/terraform/modules/osv/scripts/gcloud_build_image

@@ -102,7 +102,7 @@ tempdir="$(mktemp -d /tmp/docker.XXXXXX)"
 cd "${tempdir}"
 
 # Be careful about exposing the access token.
-access_token="$(gcloud auth print-access-token)"
+access_token="$(gcloud auth application-default print-access-token)"
 curl --fail -o "service.json" -H @- \
   "https://servicemanagement.googleapis.com/v1/services/${SERVICE}/configs/${CONFIG_ID}?view=FULL" <<EOF || error_exit "Failed to download service config"
 Authorization: Bearer ${access_token}

docs/Gemfile.lock

@@ -235,7 +235,7 @@ GEM
     minitest (5.27.0)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    nokogiri (1.18.10-x86_64-linux-gnu)
+    nokogiri (1.19.1-x86_64-linux-gnu)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)

docs/README.md

@@ -1,6 +1,35 @@
-# OpenAPI generation
+# README
 
-## Prerequisites
+The [OSV.dev docs](https://osv.dev/docs) are hosted on [GitHub Pages](https://pages.github.com/).
+
+## Running docs locally (docker)
+
+You can run the docs locally consistently through docker. From the `docs` directory, run:
+
+```bash
+docker build -t osvdev-docs -f docs.Dockerfile .
+docker run -p 4000:4000 osvdev-docs
+```
+
+## Running docs locally (native)
+
+To run the docs locally:
+
+- Install `ruby (>= 3.1.0)`. This should come with `bundler`.
+  - On Debian, you need to install them separately:
+    - `ruby`
+    - `ruby-bundler`
+- In this directory:
+  - `bundle install`
+  - `bundle exec jekyll serve`
+
+Here's the full documentation on GitHub for [running Jekyll locally].
+
+[running Jekyll locally]: https://docs.github.com/en/pages/setting-up-a-github-pages-site-with-jekyll/testing-your-github-pages-site-locally-with-jekyll#building-your-site-locally
+
+## OpenAPI generation
+
+### Prerequisites
 
 Install `protoc` for your platform:
 
@@ -28,8 +57,8 @@ To install the protobuf service converter, run:
 go mod download
 ```
 
-## Generation
+### Generation
 
-```
+```bash
 python3 ./build_swagger.py
 ```

docs/docs.Dockerfile

@@ -0,0 +1,22 @@
+# Use an official Ruby runtime as a parent image.
+FROM ruby:3
+
+# Set the working directory in the container.
+WORKDIR /usr/src/app
+
+# Copy the Gemfile and Gemfile.lock, and the bundle config.
+# This is done first to leverage Docker's layer caching.
+COPY ./Gemfile* ./
+
+# Install the dependencies.
+RUN bundle install
+
+# Copy the rest of the documentation files.
+COPY ./ ./
+
+# Expose port 4000 for the Jekyll server.
+EXPOSE 4000
+
+# The command to run when the container starts.
+# --host 0.0.0.0 is important to make the server accessible from outside the container.
+CMD ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0"]

gcp/website/frontend3/package-lock.json

@@ -894,6 +894,7 @@ dl.vulnerability-details,
     padding: 0;
     font-family: $osv-heading-font-family;
     font-size: 14px;
+    overflow-wrap: anywhere;
   }
 }
 

gcp/website/frontend3/src/styles.scss

@@ -24,7 +24,7 @@ module.exports = {
         vendorsJs: {
           test: /node_modules/,
           chunks: 'initial',
-          filename: 'static/vendors.js',
+          name: 'vendors',
           priority: 1,
           maxInitialRequests: 2,
           minChunks: 1,

gcp/website/frontend3/webpack.dev.js

@@ -24,7 +24,7 @@ module.exports = {
         vendorsJs: {
           test: /node_modules/,
           chunks: 'initial',
-          filename: 'static/vendors.[contenthash].js',
+          name: 'vendors',
           priority: 1,
           maxInitialRequests: 2,
           minChunks: 1,

gcp/website/frontend3/webpack.prod.js

@@ -220,6 +220,8 @@ def docs():
 
 @blueprint.route('/linter', strict_slashes=False)
 def linter():
+  if request.host_url == 'osv.dev':
+    return redirect(request.url.replace('osv.dev', 'test.osv.dev'), code=302)
   return render_template('linter.html')