dockerize webapp and api

selimyanat · selimyanat · commit 9483fe119c89 · 2025-03-28T15:55:47.000+01:00
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -0,0 +1,47 @@
+name: Tiny-URL-CD-Pipeline
+
+on:
+  workflow_run:
+    workflows: ["Tiny-URL-CI-Pipeline"]  # must match `name:` in ci.yml
+    types:
+      - completed
+
+jobs:
+  build-docker-images:
+    #if: >
+     # github.event.workflow_run.conclusion == 'success' &&
+      #github.event.workflow_run.head_branch == 'main'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-docker-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-docker-
+
+      - name: Build API Docker image
+        run: |
+          docker build \
+            --file api/Dockerfile \
+            --tag your-org/tinyurl-api:main \
+            --cache-from=type=local,src=/tmp/.buildx-cache \
+            --cache-to=type=local,dest=/tmp/.buildx-cache \
+            ./api
+
+      - name: Build Webapp Docker image
+        run: |
+          docker build \
+            --file webapp/Dockerfile \
+            --tag your-org/tinyurl-webapp:main \
+            --cache-from=type=local,src=/tmp/.buildx-cache \
+            --cache-to=type=local,dest=/tmp/.buildx-cache \
+            ./webapp
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: Tiny URL CI Pipeline
+name: Tiny-URL-CI-Pipeline
 
 on:
   push:
diff --git a/api/src/shorten-url/create-shorten-url/create-shorten-url.controller.spec.ts b/api/src/shorten-url/create-shorten-url/create-shorten-url.controller.spec.ts
@@ -21,7 +21,11 @@ describe('ShortenUrl controller', () => {
       const response = await underTest.shortenUrl({ url: longUrl });
 
       // Extract the unique ID part of the URL
-      const urlPattern = /^http:\/\/localhost:3000\/([A-Za-z0-9]{10})$/;
+      const baseUrl = process.env.SHORTENED_BASE_URL;
+      if (!baseUrl) throw new Error('SHORTENED_BASE_URL is not defined');
+
+      const escapedBaseUrl = baseUrl.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // Escape for regex
+      const urlPattern = new RegExp(`^${escapedBaseUrl}/([A-Za-z0-9]{10})$`);
       const match = response?.shortenedUrl.match(urlPattern);
 
       expect(response).not.toBeNull();
diff --git a/webapp/app/layout.tsx b/webapp/app/layout.tsx
@@ -9,7 +9,7 @@ export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <html lang="en">
       <head>
-        <title>URL Shortener</title>
+        <title>TinyURL like application</title>
       </head>
       <body>
         <ThemeProvider theme={theme}>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Tiny URL CI Pipeline`
	`1`	`+name: Tiny-URL-CI-Pipeline`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`push:`