feat(Github): Adds some files needed for docker build/deployment

Vizzuality · Aug 1, 2024 · 4b9658b · 4b9658b
1 parent da96376
commit 4b9658b
Show file tree

Hide file tree

Showing 9 changed files with 907 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -256,7 +256,6 @@ jobs:
         id: extract_branch
 
       - name: Set environment name
-        if: ${{ steps.applicable_check.outputs.flag }}
         id: environment_name
         run: |
           {
@@ -270,7 +269,7 @@ jobs:
           ECR_REPOSITORY_CLIENT: ${{ secrets.TF_CLIENT_REPOSITORY_NAME }}
           ECR_REPOSITORY_CMS: ${{ secrets.TF_CMS_REPOSITORY_NAME }}
 #          ECR_REPOSITORY_TILER: ${{ secrets.TF_TILER_REPOSITORY_NAME }}
-          IMAGE_TAG: ${{ steps.extract_branch.outputs.branch == 'main' && 'production' || steps.extract_branch.outputs.branch }}
+          IMAGE_TAG: ${{ steps.extract_branch.outputs.branch == 'main' && 'production' || 'staging' }}
         run: |
           echo "version: '3.3'" > docker-compose.yml
           echo "services:" >> docker-compose.yml

diff --git a/client/Dockerfile b/client/Dockerfile
@@ -17,13 +17,16 @@ COPY .browserslistrc \
      .env.local \
      next.config.mjs \
      package.json \
+     entrypoint.sh \
      postcss.config.mjs \
      README.md \
      tailwind.config.ts \
      tsconfig.json \
      yarn.lock \
      ./
 
+RUN chmod +x entrypoint.sh
+
 RUN yarn install
 
 RUN chown -R node:node /app

diff --git a/client/Dockerfile.prod b/client/Dockerfile.prod
@@ -27,6 +27,8 @@ COPY .browserslistrc \
      .yarnrc.yml \
      ./
 
+RUN chmod +x entrypoint.sh
+
 RUN yarn install
 
 RUN yarn build

diff --git a/client/public/.delete-later b/client/public/.delete-later
diff --git a/cms/.yarn/releases/yarn-4.2.1.cjs b/cms/.yarn/releases/yarn-4.2.1.cjs
diff --git a/cms/.yarnrc.yml b/cms/.yarnrc.yml
@@ -4,4 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.1.0.cjs
+yarnPath: .yarn/releases/yarn-4.2.1.cjs
diff --git a/cms/Dockerfile b/cms/Dockerfile
@@ -31,6 +31,8 @@ COPY .nvmrc \
      yarn.lock \
      ./
 
+RUN chmod +x entrypoint.sh
+
 RUN yarn install
 
 ENV PATH /app/node_modules/.bin:$PATH

diff --git a/cms/Dockerfile.prod b/cms/Dockerfile.prod
@@ -31,6 +31,8 @@ COPY .env \
      yarn.lock \
      ./
 
+RUN chmod +x entrypoint.sh
+
 RUN yarn install
 
 RUN yarn strapi ts:generate-types

diff --git a/cms/package.json b/cms/package.json
@@ -33,5 +33,6 @@
     "node": ">=18.0.0 <=20.x.x",
     "npm": ">=6.0.0"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "packageManager": "[email protected]"
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ enableGlobalCache: false

		nodeLinker: node-modules

		yarnPath: .yarn/releases/yarn-4.1.0.cjs
		yarnPath: .yarn/releases/yarn-4.2.1.cjs