-
Notifications
You must be signed in to change notification settings - Fork 330
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit b545a70 Author: Steffan <[email protected]> Date: Fri Jun 24 15:10:05 2022 +0200 remove circleci commit fc8ebad Author: Steffan <[email protected]> Date: Fri Jun 24 15:08:46 2022 +0200 add migrate.js commit 7209838 Author: Steffan <[email protected]> Date: Fri Jun 24 15:06:40 2022 +0200 update Dockerfile commit 7b2baca Merge: 6cd461c e238516 Author: Steffan <[email protected]> Date: Fri Jun 24 14:45:13 2022 +0200 Merge branch 'develop' into feature/do # Conflicts: # package.json commit 6cd461c Author: Steffan <[email protected]> Date: Fri Jun 24 14:31:25 2022 +0200 update fonts commit e65319e Author: Steffan <[email protected]> Date: Thu May 19 11:38:47 2022 +0200 update Dockerfile commit 3d2efcb Author: Steffan <[email protected]> Date: Thu May 19 11:30:09 2022 +0200 update Dockerfile commit ccc30a4 Author: Steffan <[email protected]> Date: Thu May 19 09:14:29 2022 +0200 update Dockerfile commit 5869458 Author: Steffan <[email protected]> Date: Thu May 19 08:54:27 2022 +0200 update Dockerfile commit 7518682 Author: Steffan <[email protected]> Date: Wed May 18 17:09:15 2022 +0200 update Dockerfile commit d37eed8 Author: Steffan <[email protected]> Date: Wed May 18 15:37:06 2022 +0200 update Dockerfile commit 23ba68c Author: Steffan <[email protected]> Date: Wed May 18 15:27:50 2022 +0200 update Dockerfile commit 7ac7a58 Author: Steffan <[email protected]> Date: Wed May 18 09:45:38 2022 +0200 update Dockerfile commit d6a48ec Author: Steffan <[email protected]> Date: Wed May 18 08:47:51 2022 +0200 update Dockerfile commit fc3c127 Author: Steffan <[email protected]> Date: Tue May 17 18:58:02 2022 +0200 update Dockerfile commit 2c9cb03 Author: Steffan <[email protected]> Date: Tue May 17 18:38:21 2022 +0200 update Dockerfile commit 7b51b5c Author: Steffan <[email protected]> Date: Tue May 17 18:17:49 2022 +0200 update Dockerfile commit 64d23db Author: Steffan <[email protected]> Date: Tue May 17 18:07:36 2022 +0200 update Dockerfile commit 138f4c3 Author: Steffan <[email protected]> Date: Tue May 17 17:28:01 2022 +0200 update Dockerfile commit 255d6b9 Author: Steffan <[email protected]> Date: Tue May 17 12:18:46 2022 +0200 update Dockerfile commit 0364cad Author: Steffan <[email protected]> Date: Tue May 17 12:13:15 2022 +0200 update Dockerfile commit e069c0d Author: Steffan <[email protected]> Date: Tue May 17 09:42:26 2022 +0200 update Dockerfile commit 6e95eb9 Author: Steffan <[email protected]> Date: Mon May 16 23:07:07 2022 +0200 update Dockerfile commit ab0e91d Author: Steffan <[email protected]> Date: Mon May 16 22:24:42 2022 +0200 update Dockerfile commit 2ff152f Author: Steffan <[email protected]> Date: Mon May 16 22:18:48 2022 +0200 update Dockerfile commit 3ff8c7f Author: Steffan <[email protected]> Date: Mon May 16 17:57:24 2022 +0200 update Dockerfile commit 6889be5 Author: Steffan <[email protected]> Date: Mon May 16 17:44:57 2022 +0200 update Dockerfile commit b935da6 Author: Steffan <[email protected]> Date: Mon May 16 17:42:29 2022 +0200 update Dockerfile commit 6c9d9ce Author: Steffan <[email protected]> Date: Mon May 16 17:38:00 2022 +0200 update Dockerfile commit 34bf183 Author: Steffan <[email protected]> Date: Mon May 16 17:36:08 2022 +0200 update Dockerfile commit b6b6ea9 Author: Steffan <[email protected]> Date: Mon May 16 17:34:18 2022 +0200 update Dockerfile commit db6faf8 Author: Steffan <[email protected]> Date: Mon May 16 17:30:32 2022 +0200 update Dockerfile commit 0f67142 Author: Steffan <[email protected]> Date: Mon May 16 17:17:38 2022 +0200 add Dockerfile commit bc98475 Author: Steffan <[email protected]> Date: Mon May 16 16:53:40 2022 +0200 update do config commit 271d95f Author: Steffan <[email protected]> Date: Mon May 16 16:52:49 2022 +0200 update do config commit 982f740 Author: Steffan <[email protected]> Date: Mon May 16 16:25:49 2022 +0200 add do config
- Loading branch information
Showing
27 changed files
with
773 additions
and
85 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,6 @@ | |
/assets/uikit | ||
!/assets/google | ||
/css | ||
/fonts | ||
main.min.js | ||
js/*.min.js | ||
.DS_Store | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
FROM node:16-alpine as build | ||
|
||
# environment variables | ||
ARG COMMIT_HASH=empty | ||
ENV COMMIT_HASH $COMMIT_HASH | ||
|
||
# install dependencies | ||
WORKDIR /app | ||
COPY package.json . | ||
COPY yarn.lock . | ||
RUN yarn install | ||
|
||
# install uikit | ||
WORKDIR /app/node_modules/uikit | ||
RUN yarn install | ||
|
||
# build uikit | ||
WORKDIR /app | ||
COPY . . | ||
RUN mv ./node_modules/uikit ./assets && \ | ||
yarn compile | ||
|
||
# cleanup | ||
RUN sed -i "s/{{BUILD}}/$COMMIT_HASH/g" app/main.min.js && \ | ||
sed -i "s/{{BUILD}}/$COMMIT_HASH/g" docs/app/main.min.js && \ | ||
sed -i "s/{{BUILD}}/$COMMIT_HASH/g" docs/index.html && \ | ||
sed -i "s/{{BUILD}}/$COMMIT_HASH/g" index.html && \ | ||
rm -rf ./node_modules/ && \ | ||
rm -rf ./assets/uikit/node_modules/ | ||
|
||
# build uikit v2 | ||
FROM node:16-alpine as build-v2 | ||
ADD https://github.com/uikit/uikit-site/releases/download/2016.12/uikit-site-v2.zip uikit.zip | ||
RUN unzip uikit.zip -d ./uikit && \ | ||
rm uikit.zip && \ | ||
mv ./uikit ./app | ||
|
||
WORKDIR /app | ||
RUN yarn install && \ | ||
yarn gulp build-site && \ | ||
rm -rf ./node_modules/ | ||
|
||
# setup httpd | ||
FROM httpd:2.4-alpine as httpd | ||
WORKDIR /usr/local/apache2 | ||
RUN sed -i "s/ServerAdmin [email protected]/ServerAdmin [email protected]/" ./conf/httpd.conf && \ | ||
sed -i "s/AllowOverride None/AllowOverride All/" ./conf/httpd.conf && \ | ||
sed -i "/LoadModule rewrite_module/s/^#//g" ./conf/httpd.conf && \ | ||
sed -i "/LoadModule expires_module/s/^#//g" ./conf/httpd.conf | ||
|
||
# copy htdocs | ||
WORKDIR /usr/local/apache2/htdocs | ||
COPY --from=build /app/ . | ||
COPY --from=build-v2 /app/ ./v2 |
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,33 @@ | ||
{ | ||
"scripts": { | ||
"install": "cd ./node_modules/uikit && yarn && cd ../../ && symlink-dir ./node_modules/uikit ./assets/uikit", | ||
"setup": "yarn && yarn compile", | ||
"compile": "yarn compile-js && yarn compile-less && yarn compile-uikit", | ||
"compile-uikit": "cd ./assets/uikit && yarn compile-less && yarn compile-rtl && yarn compile-js uikit tests", | ||
"compile-js": "webpack", | ||
"compile-less": "make-dir css && lessc less/theme.less > css/theme.css --relative-urls --rootpath=../less/ --clean-css", | ||
"eslint": "eslint ./", | ||
"watch-js": "webpack -w --devtool=inline-source-map" | ||
}, | ||
"eslintIgnore": [ | ||
"*.min.js", | ||
"*.json" | ||
], | ||
"devDependencies": { | ||
"@babel/core": "^7.17.8", | ||
"@babel/preset-env": "^7.16.4", | ||
"babel-loader": "^8.2.4", | ||
"eslint": "8.12.0", | ||
"eslint-plugin-vue": "^8.5.0", | ||
"less": "^4.1.2", | ||
"less-plugin-clean-css": "^1.5.1", | ||
"make-dir-cli": "^3.0.0", | ||
"symlink-dir": "^5.0.1", | ||
"uikit": "3.14.3", | ||
"uniqid": "^5.4.0", | ||
"vue-loader": "^15.9.8", | ||
"vue-template-compiler": "^2.6.14", | ||
"webpack": "^5.70.0", | ||
"webpack-cli": "^4.9.2" | ||
} | ||
"scripts": { | ||
"setup": "yarn && yarn uikit && yarn compile", | ||
"uikit": "cd ./node_modules/uikit && yarn && cd ../../ && symlink-dir ./node_modules/uikit ./assets/uikit", | ||
"compile": "yarn compile-js && yarn compile-less && yarn compile-uikit", | ||
"compile-uikit": "cd ./assets/uikit && yarn compile-less && yarn compile-rtl && yarn compile-js uikit tests", | ||
"compile-js": "webpack", | ||
"compile-less": "make-dir css && lessc less/theme.less > css/theme.css --relative-urls --rootpath=../less/ --clean-css", | ||
"eslint": "eslint ./", | ||
"watch-js": "webpack -w --devtool=inline-source-map" | ||
}, | ||
"eslintIgnore": [ | ||
"*.min.js", | ||
"*.json" | ||
], | ||
"devDependencies": { | ||
"@babel/core": "^7.17.8", | ||
"@babel/preset-env": "^7.16.4", | ||
"babel-loader": "^8.2.4", | ||
"eslint": "8.12.0", | ||
"eslint-plugin-vue": "^8.5.0", | ||
"less": "^4.1.2", | ||
"less-plugin-clean-css": "^1.5.1", | ||
"make-dir-cli": "^3.0.0", | ||
"symlink-dir": "^5.0.1", | ||
"uikit": "3.14.3", | ||
"uniqid": "^5.4.0", | ||
"vue-loader": "^15.9.8", | ||
"vue-template-compiler": "^2.6.14", | ||
"webpack": "^5.70.0", | ||
"webpack-cli": "^4.9.2" | ||
} | ||
} |