Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ jobs:
password: ${{ secrets.HUB_TOKEN }}
- name: create and push an image
run: |
chmod +x ./build.sh
if [ "${GITHUB_REF##*/}" == "master" ]; then
VERSION="2.5.${GITHUB_RUN_NUMBER}"
VERSION="3.0.${GITHUB_RUN_NUMBER}"
else
BRANCH_TO_DOCKER=$(echo ${GITHUB_REF##*/} | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9._-]//g')
VERSION="${BRANCH_TO_DOCKER}-${GITHUB_RUN_NUMBER}"
fi
sudo ./build.sh "registry.hub.docker.com" "wurstbrot" "dsomm" "${VERSION}" "${{ secrets.HUB_USERNAME }}" "${{ secrets.HUB_TOKEN }}"
sudo docker build -t wurstbrot/dsomm:latest .
sudo docker push wurstbrot/dsomm:latest
sudo docker tag wurstbrot/dsomm:${VERSION}
sudo docker push wurstbrot/dsomm:${VERSION}
14 changes: 0 additions & 14 deletions .github/workflows/test.yml

This file was deleted.

10 changes: 10 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM node:18.7-alpine AS build
WORKDIR /usr/src/app
COPY package.json package-lock.json ./
RUN npm install
COPY . .
RUN npm run build

FROM bitnami/nginx:latest
#COPY nginx.conf /etc/nginx/nginx.conf
COPY --from=build /usr/src/app/dist/dsomm/ /app
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
"maximumError": "2mb"
},
{
"type": "anyComponentStyle",
Expand Down
4 changes: 2 additions & 2 deletions src/app/component/matrix/matrix.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export class MatrixComponent implements OnInit {

// function to initialize if level columns exists
ngOnInit(): void {
this.yaml.setURI('./assets/YAML/sample.yaml');
this.yaml.setURI('./assets/YAML/meta.yaml');
// Function sets column header
this.yaml.getJson().subscribe((data) => {
this.YamlObject = data;
Expand All @@ -64,7 +64,7 @@ export class MatrixComponent implements OnInit {
});

//gets value from generated folder
this.yaml.setURI('./assets/YAML/generated/sample.yaml');
this.yaml.setURI('./assets/YAML/generated/generated.yaml');
// Function sets data
this.yaml.getJson().subscribe((data) => {
this.YamlObject = data;
Expand Down
File renamed without changes.