From b5ce2d704885fb3ad544877f3e51774447a8fca7 Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Thu, 12 Apr 2018 21:48:52 -0700
Subject: [PATCH] Packaging fixes

---
 .ackrc            | 2 ++
 Dockerfile        | 2 +-
 Dockerfile.dev    | 2 +-
 gulpfile.babel.js | 4 ++--
 package.json      | 2 +-
 scripts/dev       | 4 ++--
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.ackrc b/.ackrc
index c9fdae0764a..29d17e2cb4d 100644
--- a/.ackrc
+++ b/.ackrc
@@ -1 +1,3 @@
 --ignore-dir=public
+--ignore-dir=static
+--ignore-dir=src/img
diff --git a/Dockerfile b/Dockerfile
index 50522e752e9..5fa1b16e1b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rancherlabs/website:build as build
+FROM rancher/docs:build as build
 
 WORKDIR /run
 
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 491ec742e1f..4137bc21a2e 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -39,7 +39,7 @@ RUN  ln -s /site/config.toml /run \
 COPY gulpfile.babel.js /run/
 
 # Expose default hugo port
-EXPOSE 9000
+EXPOSE 9001
 
 ENTRYPOINT ["gulp"]
 CMD ["dev"]
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 7a658732e6b..21d702b7472 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -46,7 +46,7 @@ gulp.task('init-watch', () => {
     server: {
       baseDir: 'public'
     },
-    port: 9020,
+    port: 9001,
     open: false
   });
   $.watch('src/sass/**/*.scss', () => gulp.start('sass'));
@@ -82,7 +82,7 @@ gulp.task('hugo-preview', (cb) => {
 });
 
 gulp.task('hugo-dev', (cb) => {
-  return spawn('hugo', ['--buildDrafts', '--buildFuture', '--baseURL=http://localhost:9020/'], { stdio: 'inherit' }).on('close', (/* code */) => {
+  return spawn('hugo', ['--buildDrafts', '--buildFuture', '--baseURL=http://localhost:9001/'], { stdio: 'inherit' }).on('close', (/* code */) => {
     browserSync.reload();
     cb();
   });
diff --git a/package.json b/package.json
index 2d7a7baada2..e8b9b2680e7 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "RancherLabs - Docs",
+  "name": "rancher-docs",
   "private": true,
   "scripts": {
     "build": "gulp build",
diff --git a/scripts/dev b/scripts/dev
index 01e4aa10dcf..20b02f180be 100755
--- a/scripts/dev
+++ b/scripts/dev
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PORT=9000
+PORT=9001
 THEME=
 
 # cd to app root
@@ -64,4 +64,4 @@ if [[ "$THEME" ]]; then
   THEMEVOLUME="-v ${ABSOLUTE}:/run/node_modules/rancher-website-theme"
 fi
 
-docker run --rm -p ${PORT}:${PORT} -it -v $(pwd):/site ${THEMEVOLUME} rancherlabs/website:dev dev --port=${PORT}
+docker run --rm -p ${PORT}:${PORT} -it -v $(pwd):/site ${THEMEVOLUME} rancher/docs:dev dev --port=${PORT}