|
|
@@ -29,38 +29,36 @@ RUN apt-get update -y && apt-get install -y \
|
|
|
maven \
|
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
|
|
-#RUN add-apt-repository -y ppa:webupd8team/java
|
|
|
-#RUN apt-get update -y
|
|
|
-#RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
|
|
|
-#RUN apt-get install -y oracle-java8-installer
|
|
|
+RUN add-apt-repository -y ppa:webupd8team/java
|
|
|
+RUN apt-get update -y
|
|
|
+RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
|
|
|
+RUN apt-get install -y oracle-java8-installer
|
|
|
|
|
|
ADD . /hue
|
|
|
+WORKDIR /hue
|
|
|
|
|
|
-RUN cd /hue && PREFIX=/usr/share make install
|
|
|
-RUN useradd -ms /bin/bash hue && chown -R hue /usr/share/hue
|
|
|
-RUN chmod 777 /usr/share/hue/desktop/desktop.db
|
|
|
+# Not doing a `make prod` equivalent, so manually getting production ini
|
|
|
+RUN rm desktop/conf/*
|
|
|
+COPY desktop/conf.dist desktop/conf
|
|
|
|
|
|
-# Not doing a `make prod` above yet, so manually get prod ini
|
|
|
-RUN rm /usr/share/hue/desktop/conf/*
|
|
|
-COPY desktop/conf.dist /usr/share/hue/desktop/conf
|
|
|
+# Need recent version for Ubuntu
|
|
|
+RUN curl -sL https://deb.nodesource.com/setup_8.x | sudo bash -
|
|
|
+RUN apt-get install -y nodejs
|
|
|
|
|
|
-COPY tools/docker/hue/conf /usr/share/hue/desktop/conf
|
|
|
-COPY tools/docker/hue/startup.sh /usr/share/hue
|
|
|
+RUN PREFIX=/usr/share make install
|
|
|
+RUN useradd -ms /bin/bash hue && chown -R hue /usr/share/hue
|
|
|
|
|
|
WORKDIR /usr/share/hue
|
|
|
RUN ./build/env/bin/pip install psycopg2-binary
|
|
|
|
|
|
-# Webpack not integrated into make install yet
|
|
|
-COPY package.json /usr/share/hue
|
|
|
-COPY webpack.config.js /usr/share/hue
|
|
|
-
|
|
|
-# Need recent version for Ubuntu
|
|
|
-RUN curl -sL https://deb.nodesource.com/setup_8.x | sudo bash -
|
|
|
-RUN apt-get install -y nodejs
|
|
|
+COPY tools/docker/hue/conf desktop/conf
|
|
|
+COPY tools/docker/hue/startup.sh .
|
|
|
|
|
|
+# Webpack not integrated into make install
|
|
|
+COPY package.json .
|
|
|
+COPY webpack.config.js .
|
|
|
RUN npm install
|
|
|
RUN npm run webpack
|
|
|
-
|
|
|
RUN ./build/env/bin/hue collectstatic --noinput
|
|
|
|
|
|
EXPOSE 8888
|