Merge pull request #22 from vincent99/master

Base URL, dev script
This commit is contained in:
Vincent Fiduccia
2018-04-24 16:47:47 -07:00
committed by GitHub
3 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -23,5 +23,5 @@ RUN gulp build-staging
RUN stat /run/public/index.html RUN stat /run/public/index.html
FROM nginx FROM nginx
COPY --from=build /run/public /usr/share/nginx/html/ COPY --from=build /run/public /usr/share/nginx/html/docs/
COPY nginx.conf /etc/nginx/conf.d/default.conf COPY nginx.conf /etc/nginx/conf.d/default.conf
+2 -2
View File
@@ -45,14 +45,14 @@ gulp.task('build-dev', () => {
}); });
gulp.task('hugo', (cb) => { gulp.task('hugo', (cb) => {
return spawn('hugo', ['--buildFuture'], { stdio: 'inherit' }).on('close', (/* code */) => { return spawn('hugo', ['--buildFuture', '--baseURL=/docs'], { stdio: 'inherit' }).on('close', (/* code */) => {
browserSync.reload(); browserSync.reload();
cb(); cb();
}); });
}); });
gulp.task('hugo-staging', (cb) => { gulp.task('hugo-staging', (cb) => {
return spawn('hugo', ['--buildDrafts', '--buildFuture'], { stdio: 'inherit' }).on('close', (/* code */) => { return spawn('hugo', ['--buildDrafts', '--buildFuture', '--baseURL=/docs'], { stdio: 'inherit' }).on('close', (/* code */) => {
browserSync.reload(); browserSync.reload();
cb(); cb();
}); });
+1
View File
@@ -64,4 +64,5 @@ if [[ "$THEME" ]]; then
THEMEVOLUME="-v ${ABSOLUTE}:/run/node_modules/rancher-website-theme" THEMEVOLUME="-v ${ABSOLUTE}:/run/node_modules/rancher-website-theme"
fi fi
docker pull rancher/docs:dev
docker run --rm -p ${PORT}:${PORT} -it -v $(pwd):/site ${THEMEVOLUME} rancher/docs:dev dev --port=${PORT} docker run --rm -p ${PORT}:${PORT} -it -v $(pwd):/site ${THEMEVOLUME} rancher/docs:dev dev --port=${PORT}