Skip to content

Commit

Permalink
add buildstep to docker
Browse files Browse the repository at this point in the history
  • Loading branch information
TorstenDittmann committed Oct 21, 2021
1 parent a63649d commit 091c6ef
Show file tree
Hide file tree
Showing 13 changed files with 218 additions and 25,137 deletions.
2 changes: 0 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
app/db/SQL
node_modules
storage
public/scripts
public/styles
.git
.idea
.cd .babelrc
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/node_modules/
/tests/resources/storage/
/app/sdks/*
/public/dist/
/public/dist/*
/.idea/
.DS_Store
.php_cs.cache
Expand Down
16 changes: 15 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@ RUN composer update --ignore-platform-reqs --optimize-autoloader \
--no-plugins --no-scripts --prefer-dist \
`if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`

FROM node:16-alpine as node

WORKDIR /usr/local/src/

COPY package-lock.json /usr/local/src/
COPY package.json /usr/local/src/
COPY gulpfile.js /usr/local/src/
COPY public /usr/local/src/public

RUN npm ci
RUN npm run build

FROM php:8.0-cli-alpine as compile

ARG DEBUG=false
Expand Down Expand Up @@ -195,6 +207,7 @@ RUN \
WORKDIR /usr/src/code

COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor
COPY --from=node /usr/local/src/public/dist /usr/src/code/public/dist
COPY --from=swoole /usr/local/lib/php/extensions/no-debug-non-zts-20200930/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/yasd.so* /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
COPY --from=redis /usr/local/lib/php/extensions/no-debug-non-zts-20200930/redis.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
COPY --from=imagick /usr/local/lib/php/extensions/no-debug-non-zts-20200930/imagick.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
Expand All @@ -205,7 +218,8 @@ COPY --from=maxmind /usr/local/lib/php/extensions/no-debug-non-zts-20200930/maxm
COPY ./app /usr/src/code/app
COPY ./bin /usr/local/bin
COPY ./docs /usr/src/code/docs
COPY ./public /usr/src/code/public
COPY ./public/fonts /usr/src/code/public/fonts
COPY ./public/images /usr/src/code/public/images
COPY ./src /usr/src/code/src

# Set Volumes
Expand Down
2 changes: 2 additions & 0 deletions app/views/layouts/default.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ if(!empty($platforms)) {
});
<?php endif; ?>
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.25.0/components/prism-core.min.js" integrity="sha512-TbHaMJHEmRBDf9W3P7VcRGwEmVEJu7MO6roAE0C4yqoNHeIVo3otIX3zj1DOLtn7YCD+U8Oy1T9eMtG/M9lxRw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.25.0/plugins/autoloader/prism-autoloader.min.js" integrity="sha512-sv0slik/5O0JIPdLBCR2A3XDg/1U3WuDEheZfI/DI5n8Yqc3h5kjrnr46FGBNiUAJF7rE4LHKwQ/SoSLRKAxEA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<?php echo $this->exec($this->getParam('head', [])); ?>
</head>

Expand Down
35 changes: 17 additions & 18 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const gulpCleanCSS = require('gulp-clean-css');

// Config

const configApp = {
const configApp = {
mainFile: 'app.js',
src: [
'public/scripts/dependencies/litespeed.js',
Expand Down Expand Up @@ -76,7 +76,7 @@ const configApp = {
'public/scripts/views/general/switch.js',
'public/scripts/views/general/theme.js',
'public/scripts/views/general/version.js',

'public/scripts/views/paging/back.js',
'public/scripts/views/paging/next.js',

Expand All @@ -87,19 +87,18 @@ const configApp = {
'public/scripts/views/ui/phases.js',
'public/scripts/views/ui/trigger.js',
],

dest: './public/dist/scripts'
};

const configDep = {
mainFile: 'app-dep.js',
src: [
//'node_modules/appwrite/src/sdk.js',
'public/scripts/dependencies/appwrite.js',
'public/scripts/dependencies/chart.js',
'public/scripts/dependencies/markdown-it.js',
'public/scripts/dependencies/pell.js',
'public/scripts/dependencies/prism.js',
'public/scripts/dependencies/turndown.js',
'node_modules/chart.js/dist/chart.js',
'node_modules/markdown-it/dist/markdown-it.js',
'node_modules/pell/dist/pell.js',
'node_modules/turndown/dist/turndown.js',
],
dest: './public/dist/scripts'
};
Expand All @@ -113,40 +112,40 @@ const config = {
dest: './public/dist/scripts'
};

function lessLTR () {
function lessLTR() {
return src('./public/styles/default-ltr.less')
.pipe(gulpLess())
.pipe(gulpCleanCSS({compatibility: 'ie8'}))
.pipe(gulpCleanCSS({ compatibility: 'ie8' }))
.pipe(dest('./public/dist/styles'));
}

function lessRTL () {
function lessRTL() {
return src('./public/styles/default-rtl.less')
.pipe(gulpLess())
.pipe(gulpCleanCSS({compatibility: 'ie8'}))
.pipe(gulpCleanCSS({ compatibility: 'ie8' }))
.pipe(dest('./public/dist/styles'));
}

function concatApp () {
function concatApp() {
return src(configApp.src)
.pipe(gulpConcat(configApp.mainFile))
.pipe(gulpJsmin())
.pipe(dest(configApp.dest));
}

function concatDep () {
function concatDep() {
return src(configDep.src)
.pipe(gulpConcat(configDep.mainFile))
.pipe(gulpJsmin())
.pipe(dest(configDep.dest));
}

function concat () {
function concat() {
return src(config.src)
.pipe(gulpConcat(config.mainFile))
.pipe(dest(config.dest));
}

exports.import = series(concatDep);
exports.less = series(lessLTR, lessRTL);
exports.build = series(concatApp, concat);
exports.import = series(concatDep);
exports.less = series(lessLTR, lessRTL);
exports.build = series(concatApp, concat);
Loading

0 comments on commit 091c6ef

Please sign in to comment.