diff --git a/Dockerfile b/Dockerfile index 17a36a22339f75a4b9625246a0e0e910f6c4f6ea..566691450649f7e065fab5366fcd0c2e7e7a598c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,6 @@ RUN npm install -g --save-dev gulp COPY . /usr/src/app RUN gulp styles - RUN npm cache clean CMD [ "npm", "start" ] diff --git a/Gulpfile.js b/Gulpfile.js index af47a5dea2b7051fa016a417ac923c0c70b1c24d..e4aa47e717618173a609c3110cf85f3bd418dccb 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -12,10 +12,9 @@ var uglify = require('gulp-uglify'); var fingerprint = require('gulp-fingerprint'); var rev = require('gulp-rev'); -var RevAll = require('gulp-rev-all'); +var revAll = require('gulp-rev-all'); gulp.task('rev', () => { - var revAll = new RevAll(); return gulp.src(['public/**']) .pipe(gulp.dest('build/assets')) .pipe(revAll.revision()) diff --git a/app.js b/app.js index be1ffb94701e2c86823a39f4d6162cd1a7f4958b..433af6508a0c9b79d87644fe5344b5ebf526e3d3 100644 --- a/app.js +++ b/app.js @@ -47,7 +47,7 @@ swig.setFilter('cdn', function(input, idx) { app.engine('html', swig.renderFile); app.set('view engine', 'html'); -if (app.get('env') != 'development') { +if (isProduction) { app.set('views', path.join(__dirname, 'build', 'views')); app.use(favicon(path.join(__dirname, 'build', 'assets', 'images', 'favicon.png'))); app.use(express.static(path.join(__dirname, 'build', 'assets'))); diff --git a/docker-compose.yml b/docker-compose.yml index 4d1bf00f4352969d0b8c77d32fe562ffd1bbd735..688f381a1c81bef19525054d5dc488f874f58bf4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: - MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY build: . volumes: - - ./:/usr/src/app + # - ./:/usr/src/app - /usr/src/app/node_modules command: npm start ports: @@ -31,4 +31,4 @@ services: links: - storage - db - - sync \ No newline at end of file + - sync diff --git a/helpers/uploader.js b/helpers/uploader.js index 62f64d7a10fb4bb323397a45ba16c16607207a27..b39b6ee0143c5cf93ff63306181e6712d38188c6 100644 --- a/helpers/uploader.js +++ b/helpers/uploader.js @@ -24,11 +24,16 @@ const s3 = new AWS.S3({ endpoint: ep }); +s3.createBucket({ + Bucket: config.get("storage_bucket"), + ACL: "public-read", + GrantRead: "*" +}, (err,res) => { + console.log("createBucket",err,res); +}); + module.exports = { removeFile: (path, callback) => { - // const s3 = new AWS.S3({ - // region: 'eu-central-1' - // }); const bucket = config.get("storage_bucket"); s3.deleteObject({ Bucket: bucket, Key: path @@ -57,11 +62,6 @@ module.exports = { } }); fileStream.on('open', function () { - // FIXME - // var s3 = new AWS.S3({ - // region: 'eu-central-1' - // }); - s3.putObject({ Bucket: bucket, Key: fileName,