Skip to content

Commit eaf0461

Browse files
authored
Merge branch 'angular-ui' into angular-ui
2 parents dbc772a + 205a5b9 commit eaf0461

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ COPY . .
66
RUN npm run build
77

88
FROM bitnami/nginx:latest
9-
#COPY nginx.conf /etc/nginx/nginx.conf
10-
COPY --from=build /usr/src/app/dist/dsomm/ /app
9+
COPY nginx/location.conf /opt/bitnami/nginx/conf/bitnami/location.conf
10+
COPY --from=build /usr/src/app/dist/dsomm/ /app

nginx/location.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
location / {
2+
root /app;
3+
try_files $uri $uri/ /index.html =404;
4+
}

src/app/component/task-description/task-description.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export class TaskDescriptionComponent implements OnInit {
5858
});
5959

6060
//gets value from sample file
61-
this.yaml.setURI('./assets/YAML/sample.yaml');
61+
this.yaml.setURI('./assets/YAML/meta.yaml');
6262
// Function sets label data
6363
this.yaml.getJson().subscribe((data) => {
6464
this.YamlObject = data;

src/assets/YAML/generated/generated.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1730,7 +1730,7 @@ Implementation:
17301730
comments: ""
17311731
assessment: ""
17321732
Development and Source Control:
1733-
Local development linting and style checks performed:
1733+
Local development linting & style checks performed:
17341734
risk: Creating and developing code that contains code smells and quality issues.
17351735
measure: "Integration of quality and linting plugins with interactive development
17361736
environment (IDEs). \n"

0 commit comments

Comments
 (0)