Skip to content

Commit

Permalink
Add configuration of Application Server url (#58)
Browse files Browse the repository at this point in the history
  • Loading branch information
FelixTJDietrich authored Aug 14, 2024
1 parent 57f9adf commit f96d600
Show file tree
Hide file tree
Showing 5 changed files with 123 additions and 7 deletions.
23 changes: 23 additions & 0 deletions webapp/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
FROM node:latest as build

WORKDIR /app

COPY ./ /app/

# Fix buggy replacement of COOLIFY_URL in .env
RUN COOLIFY_URL_VALUE=$(grep '^COOLIFY_URL=' .env | cut -d '=' -f2) && \
sed -i "s|\$COOLIFY_URL|$COOLIFY_URL_VALUE|g" .env

# Set serverUrl in environment.ts
RUN APPLICATION_SERVER_URL=$(grep '^APPLICATION_SERVER_URL=' .env | cut -d '=' -f2) && \
echo "Replacing serverUrl in environment.ts with: $APPLICATION_SERVER_URL" && \
sed -i "s|serverUrl: '[^']*'|serverUrl: '$APPLICATION_SERVER_URL'|g" src/environments/environment.ts

RUN npm install
RUN npm run build

FROM nginx:latest

COPY --from=build /app/dist/webapp/browser /usr/share/nginx/html

EXPOSE 80
2 changes: 1 addition & 1 deletion webapp/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,4 @@
}
}
}
}
}
93 changes: 91 additions & 2 deletions webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions webapp/src/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@ import { provideAnimationsAsync } from '@angular/platform-browser/animations/asy
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { provideAngularQuery, QueryClient } from '@tanstack/angular-query-experimental';
import { LucideAngularModule, Home, Sun, Moon, Hammer } from 'lucide-angular';
import { routes } from './app.routes';
import { BASE_PATH } from './core/modules/openapi';
import { environment } from 'environments/environment';
import { BASE_PATH } from 'app/core/modules/openapi';
import { routes } from 'app/app.routes';

export const appConfig: ApplicationConfig = {
providers: [
provideExperimentalZonelessChangeDetection(),
provideRouter(routes),
provideAngularQuery(new QueryClient()),
{ provide: BASE_PATH, useValue: 'http://localhost:8080' },
provideHttpClient(withInterceptorsFromDi()),
provideAnimationsAsync(),
importProvidersFrom(LucideAngularModule.pick({ Home, Sun, Moon, Hammer }))
importProvidersFrom(LucideAngularModule.pick({ Home, Sun, Moon, Hammer })),
{ provide: BASE_PATH, useValue: environment.serverUrl }
]
};
3 changes: 3 additions & 0 deletions webapp/src/environments/environment.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const environment = {
serverUrl: 'http://localhost:8080'
};

0 comments on commit f96d600

Please sign in to comment.