From 453eb810ca45c0371c6b22747998a0e30a3999c3 Mon Sep 17 00:00:00 2001 From: Kasra Bigdeli Date: Thu, 23 Jan 2020 22:34:49 -0500 Subject: [PATCH] Updated Strapi based on new format https://github.com/strapi/strapi-docker/blob/master/examples/mongo/docker-compose.yml --- public/v2/apps/strapi.json | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/public/v2/apps/strapi.json b/public/v2/apps/strapi.json index 583e4cb..3b39b32 100644 --- a/public/v2/apps/strapi.json +++ b/public/v2/apps/strapi.json @@ -1,6 +1,6 @@ { "captainVersion": "2", - "documentation": "Taken from https://github.com/strapi/strapi-docker/blob/master/docker-compose.yml", + "documentation": "Taken from https://github.com/strapi/strapi-docker/blob/master/examples/mongo/docker-compose.yml", "displayName": "", "description": "The Open source Headless CMS Front-End Developers love. Manage your content. Distribute it anywhere", "dockerCompose": { @@ -11,30 +11,19 @@ "$$cap_appname-mongo" ], "containerHttpPort": "1337", - "dockerfileLines": [ - "FROM node:11.1.0-alpine", - "WORKDIR /usr/src/api", - "RUN echo \"unsafe-perm = true\" >> ~/.npmrc", - "RUN npm install -g strapi@$$cap_strapi_version", - "ADD https://raw.githubusercontent.com/strapi/strapi-docker/b0b3cab55b993c00690b249a89e09b3db7073fca/strapi.sh ./strapi.sh", - "RUN chmod +x ./strapi.sh", - "EXPOSE 1337", - "CMD [\"./strapi.sh\"]" - ], + "image": "strapi/strapi:$$cap_strapi_version", "volumes": [ - "$$cap_appname-data:/usr/src/api/$$cap_appname" + "$$cap_appname-data:/srv/app" ], "restart": "always", "environment": { - "APP_NAME": "$$cap_appname", "DATABASE_CLIENT": "mongo", "DATABASE_HOST": "srv-captain--$$cap_appname-mongo", "DATABASE_PORT": "27017", "DATABASE_NAME": "strapi", "DATABASE_USERNAME": "root", "DATABASE_PASSWORD": "$$cap_mongo_password", - "HOST": "localhost", - "DATABASE_AUTHENTICATION_DATABASE": "admin" + "DATABASE_AUTHENTICATION_DATABASE": "strapi" } }, "$$cap_appname-mongo": { @@ -63,8 +52,8 @@ "variables": [{ "id": "$$cap_strapi_version", "label": "Strapi Version", - "defaultValue": "3.0.0-alpha.24.1", - "description": "Check out their GitHub page for the valid versions https://github.com/strapi/strapi/releases", + "defaultValue": "3.0.0-beta.18.6", + "description": "Check out their page for the valid versions https://hub.docker.com/r/strapi/strapi/tags", "validRegex": "/^([^\\s^\\/])+$/" }, { @@ -82,4 +71,4 @@ } ] -} \ No newline at end of file +}