Merge pull request #47 from openpracticelibrary/strapi-upgrade

upgrade strapi to full 3.x release, resolved deployment issues
openpracticelibrary · Jun 7, 2020 · cda6eb9 · cda6eb9
2 parents fbca770 + 367c91a
commit cda6eb9
Show file tree

Hide file tree

Showing 35 changed files with 756 additions and 5,168 deletions.
diff --git a/.github/workflows/rc-release.yaml b/.github/workflows/rc-release.yaml
@@ -23,7 +23,7 @@ jobs:
           registry_password: ${{ secrets.QUAY_PASS }}
 
       - name: Tag with latest for future full releases
-        uses: tinact/docker.image_retag@1.0.2
+        uses: tinact/docker.image-retag@1.0.2
         with:
           image_name: openpracticelibrary/opl-content-api
           image_old_tag: ${{ github.sha }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -23,7 +23,7 @@ jobs:
           registry_password: ${{ secrets.QUAY_PASS }}
 
       - name: Tag with latest for future full releases
-        uses: tinact/docker.image_retag@1.0.2
+        uses: tinact/docker.image-retag@1.0.2
         with:
           image_name: openpracticelibrary/opl-content-api
           image_old_tag: ${{ github.sha }}

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+junit.xml
 ############################
 # OS X
 ############################

diff --git a/Dockerfile b/Dockerfile
@@ -1,19 +1,15 @@
 FROM node:lts
-ENV NO_UPDATE_NOTIFIER=true
 RUN apt-get update
 RUN apt-get install -y jq
 WORKDIR /app
 COPY package*.json ./
 RUN npm install
 COPY . .
 
-# # Required while upstream changes are still in PR review
-# RUN npm run patch
-# RUN jq '.dependencies |= .+ { "@apollo/federation": "^0.15.0" }' node_modules/strapi-plugin-graphql/package.json > tmp.package.json && mv tmp.package.json node_modules/strapi-plugin-graphql/package.json
-# RUN npm install
-# End required for PR review
+RUN npx patch-package
+RUN jq '.dependencies |= .+ { "@apollo/federation": "^0.15.0" }' node_modules/strapi-plugin-graphql/package.json > tmp.package.json && mv tmp.package.json node_modules/strapi-plugin-graphql/package.json
+RUN npm install
 
-ENV NODE_ENV="production"
-RUN npm run build -- --clean
-EXPOSE 1337
+RUN NODE_ENV="production" npm run build -- --clean
 ENTRYPOINT ["npm", "start"]
+
diff --git a/api/article/config/routes.json b/api/article/config/routes.json
diff --git a/api/article/controllers/article.js b/api/article/controllers/article.js