summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile7
-rw-r--r--cloudbuild.yaml15
-rw-r--r--content/docs/user_guide/compatibility/.gitignore1
-rw-r--r--content/docs/user_guide/compatibility/linux/.gitignore1
4 files changed, 15 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index af41e99d5..8fcca3db5 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,12 @@ APP_TARGET = $(patsubst cmd/gvisor-website/%,public/%,$(APP_SOURCE))
default: website
.PHONY: default
-website: all-upstream $(APP_TARGET) public/static
+website: all-upstream app public/static
.PHONY: website
+app: $(APP_TARGET)
+.PHONY: app
+
public:
mkdir -p public
@@ -56,9 +59,9 @@ bin/generate-syscall-docs: $(GEN_SOURCE)
mkdir -p bin/
go build -o bin/generate-syscall-docs gvisor.dev/website/cmd/generate-syscall-docs
-.PHONY: compatibility-docs
compatibility-docs: bin/generate-syscall-docs upstream/gvisor/bazel-bin/runsc/linux_amd64_pure_stripped/runsc
./upstream/gvisor/bazel-bin/runsc/linux_amd64_pure_stripped/runsc help syscalls -o json | ./bin/generate-syscall-docs -out ./content/docs/user_guide/compatibility/
+.PHONY: compatibility-docs
# Run a local content development server. Redirects will not be supported.
server: all-upstream compatibility-docs
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index f8bf38566..d44b448f5 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -24,7 +24,7 @@ steps:
dir: 'upstream'
# Build runsc
- name: 'gcr.io/cloud-builders/bazel'
- args:
+ args:
- 'build'
- '--show_timestamps'
- '--test_output=errors'
@@ -35,7 +35,7 @@ steps:
# Build the compatibility doc generator tool
- name: 'golang'
env: ['GO111MODULE=on']
- args:
+ args:
- 'go'
- 'build'
- '-o'
@@ -43,22 +43,25 @@ steps:
- 'gvisor.dev/website/cmd/generate-syscall-docs'
# Generate compatibility docs.
- name: 'bash'
- args:
+ args:
- 'bash'
- '-c'
- - >
+ - >
./upstream/gvisor/bazel-bin/runsc/linux_amd64_pure_stripped/runsc help syscalls -o json |
./bin/generate-syscall-docs -out ./content/docs/user_guide/compatibility/
# Pull npm dependencies for scss
- name: 'gcr.io/cloud-builders/npm'
args: ['ci']
+ # Copy App Engine app files.
+ - name: 'gcr.io/gvisor-website/hugo:0.53'
+ args: ["make", "app"]
# Generate the website.
- name: 'gcr.io/gvisor-website/hugo:0.53'
env: ['HUGO_ENV=production']
args: ["hugo"]
# Test the HTML for issues.
- name: 'gcr.io/gvisor-website/html-proofer:3.10.2'
- args:
+ args:
- "htmlproofer"
- "--disable-external"
- "--check-html"
@@ -66,7 +69,7 @@ steps:
# Deploy to App Engine only for master branch.
- name: 'gcr.io/cloud-builders/gcloud'
entrypoint: 'bash'
- args:
+ args:
- '-c'
- >
if [[ "$PROJECT_ID" == "gvisor-website" && "$BRANCH_NAME" == "master" ]]; then
diff --git a/content/docs/user_guide/compatibility/.gitignore b/content/docs/user_guide/compatibility/.gitignore
new file mode 100644
index 000000000..a08e1f35e
--- /dev/null
+++ b/content/docs/user_guide/compatibility/.gitignore
@@ -0,0 +1 @@
+linux
diff --git a/content/docs/user_guide/compatibility/linux/.gitignore b/content/docs/user_guide/compatibility/linux/.gitignore
deleted file mode 100644
index 97958c35e..000000000
--- a/content/docs/user_guide/compatibility/linux/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-amd64.md