From 658a8f33527156684e5ffd1bde762ee9a9f0d311 Mon Sep 17 00:00:00 2001
From: Menna Tullah Magdy Taha <menna.tullah.magdy731@gmail.com>
Date: Mon, 13 May 2024 16:35:22 +0200
Subject: [PATCH] Changed instruction

---
 .github/workflows/dockerise-image.yml                       | 4 +++-
 .gitmodules                                                 | 6 ------
 Dockerfiles/nodejs/Dockerfile                               | 4 +++-
 .../lillywallawitsch-Wondernest.Express                     | 1 -
 .../lillywallawitsch-Wondernest.Express/values.yml          | 3 ---
 submissions-2024/maggieekubat-Recipe/maggieekubat-Recipe    | 1 -
 submissions-2024/maggieekubat-Recipe/values.yml             | 3 ---
 7 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 submissions-2024/lillywallawitsch-Wondernest.Express/lillywallawitsch-Wondernest.Express
 delete mode 100644 submissions-2024/lillywallawitsch-Wondernest.Express/values.yml
 delete mode 160000 submissions-2024/maggieekubat-Recipe/maggieekubat-Recipe
 delete mode 100644 submissions-2024/maggieekubat-Recipe/values.yml

diff --git a/.github/workflows/dockerise-image.yml b/.github/workflows/dockerise-image.yml
index f055b2e..5eaac58 100644
--- a/.github/workflows/dockerise-image.yml
+++ b/.github/workflows/dockerise-image.yml
@@ -134,6 +134,8 @@ jobs:
              FILE_NAME=$(echo "main.js")
            elif [[ -f ./app.js ]]; then
              FILE_NAME=$(echo "app.js")
+           elif [[ -f ./index.js ]]; then
+             FILE_NAME=$(echo "index.js")
            fi 
 
              echo "FILE_NAME=$FILE_NAME" >> "$GITHUB_OUTPUT"
@@ -185,7 +187,7 @@ jobs:
           echo ${repo_name_lower_case}
 
           if [ -f ./Dockerfile ]; then
-              docker build -t europe-west10-docker.pkg.dev/code-idp/idp-artifact-registry/${user_name_lower_case}-${repo_name_lower_case}:${SHA_VALUE} . --build-arg file_name=${{ steps.get_file_name.outputs.FILE_NAME }}
+              docker build -t europe-west10-docker.pkg.dev/code-idp/idp-artifact-registry/${user_name_lower_case}-${repo_name_lower_case}:${SHA_VALUE} --build-arg file_name=${{ steps.get_file_name.outputs.FILE_NAME }} .
 
               docker push europe-west10-docker.pkg.dev/code-idp/idp-artifact-registry/${user_name_lower_case}-${repo_name_lower_case}:${SHA_VALUE}
 
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 0ce8c93..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "submissions-2024/maggieekubat-Recipe/maggieekubat-Recipe"]
-	path = submissions-2024/maggieekubat-Recipe/maggieekubat-Recipe
-	url = https://github.com/maggieekubat/Recipe
-[submodule "submissions-2024/lillywallawitsch-Wondernest.Express/lillywallawitsch-Wondernest.Express"]
-	path = submissions-2024/lillywallawitsch-Wondernest.Express/lillywallawitsch-Wondernest.Express
-	url = https://github.com/lillywallawitsch/Wondernest.Express
diff --git a/Dockerfiles/nodejs/Dockerfile b/Dockerfiles/nodejs/Dockerfile
index 18ac06b..f0de8c9 100644
--- a/Dockerfiles/nodejs/Dockerfile
+++ b/Dockerfiles/nodejs/Dockerfile
@@ -15,6 +15,8 @@ FROM base
 
 ARG file_name
 
+ENV FILE_NAME=$file_name
+
 WORKDIR /usr/src/app
 
 ENV NODE_ENV production
@@ -26,4 +28,4 @@ USER node
 COPY --chown=node:node --from=build /usr/src/app/node_modules /usr/src/app/node_modules
 COPY --chown=node:node . /usr/src/app
 
-CMD dumb-init node ${file_name}
\ No newline at end of file
+CMD dumb-init node $FILE_NAME
\ No newline at end of file
diff --git a/submissions-2024/lillywallawitsch-Wondernest.Express/lillywallawitsch-Wondernest.Express b/submissions-2024/lillywallawitsch-Wondernest.Express/lillywallawitsch-Wondernest.Express
deleted file mode 160000
index 837425e..0000000
--- a/submissions-2024/lillywallawitsch-Wondernest.Express/lillywallawitsch-Wondernest.Express
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 837425e2d6cc3966a7212cddbb91cfdf5c7b6eac
diff --git a/submissions-2024/lillywallawitsch-Wondernest.Express/values.yml b/submissions-2024/lillywallawitsch-Wondernest.Express/values.yml
deleted file mode 100644
index 5ab20cd..0000000
--- a/submissions-2024/lillywallawitsch-Wondernest.Express/values.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-  host: lillywallawitsch.idp.laurinnotemann.dev
-  image: europe-west10-docker.pkg.dev/code-idp/idp-artifact-registry/lillywallawitsch-wondernest.express:837425e2d6cc3966a7212cddbb91cfdf5c7b6eac
-  name: lillywallawitsch
diff --git a/submissions-2024/maggieekubat-Recipe/maggieekubat-Recipe b/submissions-2024/maggieekubat-Recipe/maggieekubat-Recipe
deleted file mode 160000
index a4c63aa..0000000
--- a/submissions-2024/maggieekubat-Recipe/maggieekubat-Recipe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a4c63aa3a477f8155baefd3b2758ab58865e5faf
diff --git a/submissions-2024/maggieekubat-Recipe/values.yml b/submissions-2024/maggieekubat-Recipe/values.yml
deleted file mode 100644
index cfc9a4a..0000000
--- a/submissions-2024/maggieekubat-Recipe/values.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-  host: maggieekubat.idp.laurinnotemann.dev
-  image: europe-west10-docker.pkg.dev/code-idp/idp-artifact-registry/maggieekubat-recipe:a4c63aa3a477f8155baefd3b2758ab58865e5faf
-  name: maggieekubat