From c3b21b58bb7c5e9995a1e78448312386a0d55d22 Mon Sep 17 00:00:00 2001
From: PurpleBabar <lalung.alexandre@gmail.com>
Date: Wed, 25 Oct 2023 23:52:56 +0200
Subject: [PATCH 1/2] Adding Docker support (#6)

* Adding dockerfile and github action

* typo

* adding repo owner to github action

* adding lowercase owner name

* adding step for container name

* typo

---------

Co-authored-by: Caesar Kabalan <caesar.kabalan@gmail.com>
---
 .dockerignore                               |  4 +++
 .github/workflows/docker_build_and_push.yml | 34 +++++++++++++++++++++
 Dockerfile                                  | 13 ++++++++
 src/package.json                            |  2 +-
 4 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 .dockerignore
 create mode 100644 .github/workflows/docker_build_and_push.yml
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..bd3c212
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+.gitignore
+src/cloudformation.yaml
+LICENSE
+README.md
\ No newline at end of file
diff --git a/.github/workflows/docker_build_and_push.yml b/.github/workflows/docker_build_and_push.yml
new file mode 100644
index 0000000..840671a
--- /dev/null
+++ b/.github/workflows/docker_build_and_push.yml
@@ -0,0 +1,34 @@
+name: docker
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - 
+        id: container_name
+        uses: ASzc/change-string-case-action@v5
+        with:
+          string: ${{ github.repository_owner }}/${{ github.event.repository.name }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: ${{ steps.container_name.outputs.lowercase }}:latest
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..9709b20
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM node:20-alpine as build
+
+ARG REACT_APP_SERVICES_HOST=/services/m
+
+COPY . /app
+WORKDIR /app/src
+
+RUN npm install
+RUN npm run build
+
+
+FROM nginx
+COPY --from=build /app/dist /usr/share/nginx/html
\ No newline at end of file
diff --git a/src/package.json b/src/package.json
index 0982b2d..13842ce 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
 	"dependencies": {
-		"bootstrap": "^5.2.3",
+		"bootstrap": "^5.3.2",
 		"lz-string": "^1.5.0",
 		"http-server": "^14.1.1"
 	},

From 51b59d9fd7ec520da778f3812118b9ff2b9872f4 Mon Sep 17 00:00:00 2001
From: Caesar Kabalan <caesar.kabalan@gmail.com>
Date: Wed, 25 Oct 2023 15:05:24 -0700
Subject: [PATCH 2/2] Add Docker tags for develop

---
 .github/workflows/docker_build_and_push.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker_build_and_push.yml b/.github/workflows/docker_build_and_push.yml
index 840671a..d8c40d5 100644
--- a/.github/workflows/docker_build_and_push.yml
+++ b/.github/workflows/docker_build_and_push.yml
@@ -3,8 +3,13 @@ name: docker
 on:
   push:
     branches:
+      - 'develop'
       - 'main'
 
+env:
+  DOCKERHUB_TAG: ${{ env.BRANCH == 'main' && 'latest' || 'develop' }}
+
+
 jobs:
   docker:
     runs-on: ubuntu-latest
@@ -31,4 +36,5 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: true
-          tags: ${{ steps.container_name.outputs.lowercase }}:latest
\ No newline at end of file
+          tags: ${{ steps.container_name.outputs.lowercase }}:${{ env.DOCKERHUB_TAG }}
+