Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Wolfgang Knopki
Spacedeck-open-SAML
Commits
82020362
Commit
82020362
authored
Apr 07, 2017
by
Lukas F. Hartmann
Browse files
don't default to app volume mount; create s3 bucket on boot; fix revAll gulp step
parent
03059b67
Changes
5
Hide whitespace changes
Inline
Side-by-side
Dockerfile
View file @
82020362
...
...
@@ -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" ]
...
...
Gulpfile.js
View file @
82020362
...
...
@@ -12,10 +12,9 @@ var uglify = require('gulp-uglify');
var
fingerprint
=
require
(
'
gulp-fingerprint
'
);
var
rev
=
require
(
'
gulp-rev
'
);
var
R
evAll
=
require
(
'
gulp-rev-all
'
);
var
r
evAll
=
require
(
'
gulp-rev-all
'
);
gulp
.
task
(
'
rev
'
,
()
=>
{
var
revAll
=
new
RevAll
();
return
gulp
.
src
([
'
public/**
'
])
.
pipe
(
gulp
.
dest
(
'
build/assets
'
))
.
pipe
(
revAll
.
revision
())
...
...
app.js
View file @
82020362
...
...
@@ -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
'
)));
...
...
docker-compose.yml
View file @
82020362
...
...
@@ -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
helpers/uploader.js
View file @
82020362
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment