Merge pull request #24 from 0xPolygon/nadim/fix-nginx

Avoid polluting top-level repo directory
0xPolygon · Nov 29, 2023 · fd44877 · fd44877
2 parents a0de7ec + 4f7fe43
commit fd44877
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/Dockerfile.nginx → .github/assets/Dockerfile.nginx b/Dockerfile.nginx → .github/assets/Dockerfile.nginx
@@ -5,7 +5,7 @@ FROM nginx:alpine
 COPY site /usr/share/nginx/html
 
 #Replace default nginx.conf with custom configuration
-COPY nginx.conf /etc/nginx/conf.d/default.conf
+COPY .github/assets/nginx.conf /etc/nginx/conf.d/default.conf
 
 # Expose the desired port (default is 80 for NGINX)
 EXPOSE 80

diff --git a/dev-taskdef.json → .github/assets/dev-taskdef.json b/dev-taskdef.json → .github/assets/dev-taskdef.json
diff --git a/nginx.conf → .github/assets/nginx.conf b/nginx.conf → .github/assets/nginx.conf
diff --git a/prod-taskdef.json → .github/assets/prod-taskdef.json b/prod-taskdef.json → .github/assets/prod-taskdef.json
diff --git a/staging-taskdef.json → .github/assets/staging-taskdef.json b/staging-taskdef.json → .github/assets/staging-taskdef.json
diff --git a/.github/workflows/dev_deployment.yml b/.github/workflows/dev_deployment.yml
@@ -17,7 +17,7 @@ jobs:
       ECR_REPOSITORY: docs-dev-ecr
       ECS_SERVICE: docs-dev-ecs-service
       ECS_CLUSTER: frontend-dev-ecs-cluster
-      ECS_TASK_DEFINITION: dev-taskdef.json
+      ECS_TASK_DEFINITION: .github/assets/dev-taskdef.json
       CONTAINER_NAME: docs-dev
     steps:
       - name: Checkout
@@ -53,7 +53,7 @@ jobs:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f Dockerfile.nginx .
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f .github/assets/Dockerfile.nginx .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
 

diff --git a/.github/workflows/prod_deployment.yml b/.github/workflows/prod_deployment.yml
@@ -24,7 +24,7 @@ jobs:
       ECR_REPOSITORY: docs-ecr
       ECS_SERVICE: docs-ecs-service
       ECS_CLUSTER: frontend-prod-ecs-cluster
-      ECS_TASK_DEFINITION: prod-taskdef.json
+      ECS_TASK_DEFINITION: .github/assets/prod-taskdef.json
       CONTAINER_NAME: docs
     steps:
       - name: Checkout
@@ -60,7 +60,7 @@ jobs:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f Dockerfile.nginx .
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f .github/assets/Dockerfile.nginx .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
 

diff --git a/.github/workflows/staging_deployment.yml b/.github/workflows/staging_deployment.yml
@@ -17,7 +17,7 @@ jobs:
       ECR_REPOSITORY: docs-staging-ecr
       ECS_SERVICE: docs-staging-ecs-service
       ECS_CLUSTER: frontend-staging-ecs-cluster
-      ECS_TASK_DEFINITION: staging-taskdef.json
+      ECS_TASK_DEFINITION: .github/assets/staging-taskdef.json
       CONTAINER_NAME: docs-staging
     steps:
       - name: Checkout
@@ -53,7 +53,7 @@ jobs:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f Dockerfile.nginx .
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f .github/assets/Dockerfile.nginx .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT