Update master from integration (#416)

* set strapi env var on devhub-content-integration jobs (#414)

* Update Dockerfile (#415)

* Update deploy-integration-ec2.yml

Update deploy action to start 2 workers

* Update deploy-integration-ec2.yml

* Update deploy-production-ec2.yml

* Apply suggestions from code review

Co-authored-by: madelinezec <[email protected]>

Author: casthewiz

.github/workflows/deploy-integration-ec2.yml

@@ -22,10 +22,10 @@ jobs:
           cd docs-worker-pool
           git fetch origin
           git checkout origin/integration
-          sudo docker system prune
+          sudo docker system prune -af
           sudo docker build --no-cache --tag integration .
           sudo docker stop $(sudo docker ps -a -q)
-          sudo docker build --no-cache --tag stage .
+          sudo sh rundocker.sh
           sudo sh rundocker.sh
           '
           

.github/workflows/deploy-production-ec2.yml

@@ -22,7 +22,7 @@ jobs:
           cd docker/docs-worker-pool
           git fetch origin
           git checkout $(git describe --tags)
-          sudo docker system prune
+          sudo docker system prune -af
           sudo docker build --no-cache --tag production .
           sudo docker stop $(sudo docker ps -a -q)
           sudo sh rundocker.sh
@@ -45,7 +45,7 @@ jobs:
           cd docker/docs-worker-pool
           git fetch origin
           git checkout $(git describe --tags)
-          sudo docker system prune
+          sudo docker system prune -af
           sudo docker build --no-cache --tag production .
           sudo docker stop $(sudo docker ps -a -q)
           sudo sh rundocker.sh

Dockerfile

@@ -42,14 +42,14 @@ RUN python3 -m pip install pip==20.2 flit==3.0.0
 RUN git clone https://github.com/mongodb/snooty-parser.git && \
 	cd snooty-parser && \
 	git fetch --tags && \
-	git checkout v0.9.6 && \
+	git checkout v0.9.7 && \
 	FLIT_ROOT_INSTALL=1 python3 -m flit install
 
 # install snooty front-end
 RUN git clone https://github.com/mongodb/snooty.git snooty
 RUN cd snooty && \
 	git fetch --all && \
-	git checkout v0.9.8 && \	
+	git checkout v0.9.9 && \	
 	npm install && \
 	git clone https://github.com/mongodb/docs-tools.git docs-tools && \
 	mkdir -p ./static/images && \

worker/jobTypes/githubJob.js

@@ -326,6 +326,11 @@ class GitHubJobClass {
       // thus why the series of makefile targets are slightly different btwn prod and staging jobs
       if (this.buildNextGen() && !isProdDeployJob) {
         commandsToBuild[commandsToBuild.length - 1] = 'make next-gen-html';
+        //tell Gatsby to pull in draft data from CMS
+        //TODO: this stanza can be removed when devhub is entirely off autobuilder
+        if (this.currentJob.payload.repoName === 'devhub-content-integration') {
+            commandsToBuild[commandsToBuild.length - 1] += ` STRAPI_PUBLICATION_STATE=preview`;
+          }
       }
 
       //check if prod deploy job