Skip to content

Commit a2dbc7f

Browse files
authored
Merge pull request #4 from wikirate/staging
Add workflow, upgrading angular, updating assets.
2 parents b68658c + b5a5d5c commit a2dbc7f

File tree

85 files changed

+23033
-20086
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+23033
-20086
lines changed

.browserslistrc

-16
This file was deleted.

.github/workflows/docker-build.yaml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Build and publish Docker image
2+
3+
on:
4+
push:
5+
branches: [ main, staging ]
6+
paths:
7+
- 'dist/**'
8+
- 'docker/**'
9+
10+
jobs:
11+
build-and-push-image:
12+
runs-on: ubuntu-latest
13+
14+
permissions:
15+
contents: read
16+
packages: write
17+
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@v4.2.2
21+
22+
- name: Log in to the Container registry
23+
uses: docker/login-action@v3.3.0
24+
with:
25+
registry: ghcr.io
26+
username: ${{ github.actor }}
27+
password: ${{ secrets.GITHUB_TOKEN }}
28+
29+
- name: Extract metadata for Docker
30+
id: meta
31+
uses: docker/metadata-action@v5.5.1
32+
with:
33+
images: ghcr.io/${{ github.repository }}
34+
tags: |
35+
type=raw,value={{sha}}
36+
37+
- name: Build and push Docker image
38+
uses: docker/build-push-action@v6.9.0
39+
with:
40+
push: true
41+
file: docker/Dockerfile
42+
tags: ${{ steps.meta.outputs.tags }}
43+
labels: ${{ steps.meta.outputs.labels }}

angular.json

+13-10
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@
1818
"prefix": "app",
1919
"architect": {
2020
"build": {
21-
"builder": "@angular-devkit/build-angular:browser",
21+
"builder": "@angular-devkit/build-angular:application",
2222
"options": {
23-
"outputPath": "dist/fashion-facility-checker",
23+
"outputPath": {
24+
"base": "dist/fashion-facility-checker"
25+
},
2426
"index": "src/index.html",
25-
"main": "src/main.ts",
26-
"polyfills": "src/polyfills.ts",
27+
"polyfills": [
28+
"zone.js",
29+
"@angular/localize/init"
30+
],
2731
"tsConfig": "tsconfig.app.json",
2832
"inlineStyleLanguage": "scss",
2933
"assets": [
@@ -36,7 +40,8 @@
3640
"node_modules/font-awesome/css/font-awesome.css"
3741
],
3842
"scripts": ["node_modules/bootstrap/dist/js/bootstrap.js"
39-
]
43+
],
44+
"browser": "src/main.ts"
4045
},
4146
"configurations": {
4247
"production": {
@@ -61,9 +66,7 @@
6166
"outputHashing": "all"
6267
},
6368
"development": {
64-
"buildOptimizer": false,
6569
"optimization": false,
66-
"vendorChunk": true,
6770
"extractLicenses": false,
6871
"sourceMap": true,
6972
"namedChunks": true
@@ -75,18 +78,18 @@
7578
"builder": "@angular-devkit/build-angular:dev-server",
7679
"configurations": {
7780
"production": {
78-
"browserTarget": "fashion-facility-checker:build:production"
81+
"buildTarget": "fashion-facility-checker:build:production"
7982
},
8083
"development": {
81-
"browserTarget": "fashion-facility-checker:build:development"
84+
"buildTarget": "fashion-facility-checker:build:development"
8285
}
8386
},
8487
"defaultConfiguration": "development"
8588
},
8689
"extract-i18n": {
8790
"builder": "@angular-devkit/build-angular:extract-i18n",
8891
"options": {
89-
"browserTarget": "fashion-facility-checker:build"
92+
"buildTarget": "fashion-facility-checker:build"
9093
}
9194
},
9295
"test": {

0 commit comments

Comments
 (0)