Skip to content

docker image ci #128 #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vaibhav-upbytes wants to merge 2 commits into
base: development
Choose a base branch
from
Open

docker image ci #128 #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3de4a5a
docker image ci #128
vaibhav-upbytes Oct 25, 2021
eff0d1f
Merge branch 'development' into feature/docker_image_yml
vaibhav-upbytes Oct 25, 2021
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
6 changes: 3 additions & 3 deletions .github/workflows/docker-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Docker Image CI

on:
push:
branches: [ master ]
branches: [ development ]
pull_request:
branches: [ master ]
branches: [ development ]

jobs:

Expand All @@ -15,4 +15,4 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Build the Docker image
run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
run: docker build . --file Dockerfile --tag upbytes/angular-material-calendar-demo:$(date +%s)
5 changes: 3 additions & 2 deletions projects/angular-material-calendar/theme/angular-material-calendar.theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@import './calendar-event-view.theme.scss';
@import './calendar-even-full-view.theme.scss';


@mixin angular-material-calendar($angular-material-calendar) {
@include calendar-month-view-grid-header-theme($angular-material-calendar);
@include calendar-header-label-theme($angular-material-calendar);
Expand All @@ -23,5 +24,5 @@
@include calendar-day-view-grid-theme($angular-material-calendar);
@include calendar-day-view-theme($angular-material-calendar);
@include calendar-event-view-theme($angular-material-calendar);
@include calendar-full-view-theme($angular-material-calendar)
}
@include calendar-full-view-theme($angular-material-calendar);
}