Updated to HDP 2.6, workaround for the Postgres sed permissions error

randerzander · Apr 4, 2017 · 133bcd3 · 133bcd3
1 parent fa5f108
commit 133bcd3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/.env b/.env
@@ -1,12 +1,10 @@
 # docker-compose build-args
-DDL_URL=https://raw.githubusercontent.com/apache/ambari/branch-2.4/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
-AMBARI_REPO_URL=http://public-repo-1.hortonworks.com/ambari/centos6/2.x/updates/2.4.2.0/ambari.repo
-#HDP_REPO_URL=http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.5.3.0/hdp.repo
-HDP_REPO_URL=http://private-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.5.3.4-5/hdp.repo
+AMBARI_DDL_URL=https://raw.githubusercontent.com/apache/ambari/branch-2.5/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+AMBARI_REPO_URL=http://public-repo-1.hortonworks.com/ambari/centos6/2.x/updates/2.5.0.3/ambari.repo
+HDP_REPO_URL=http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.6.0.3/hdp.repo
 
 # submit-blueprint.sh
 OS=redhat6
-HDP_VERSION=2.5
+HDP_VERSION=2.6
 AMBARI_HOST=localhost:8080
-#BASE_URL=http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.5.3.0/
-BASE_URL=http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.5.3.4-5/
+BASE_URL=http://private-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.6.0.0-598
diff --git a/containers/node/Dockerfile b/containers/node/Dockerfile
@@ -23,6 +23,9 @@ RUN yum install -y zeppelin*
 RUN yum install -y falcon_*
 RUN yum install -y oozie_*
 #RUN yum install -y lucidworks-hdpsearch
+RUN yum install -y smartsense*
+RUN yum install -y druid*
+RUN yum install -y superset*
 RUN yum install -y lzo snappy-devel rpcbind
 RUN rm /etc/yum.repos.d/hdp*.repo
 ADD scripts/start.sh /start.sh

diff --git a/containers/postgres/Dockerfile b/containers/postgres/Dockerfile
@@ -1,7 +1,7 @@
 FROM postgres
 RUN apt-get update -y
 RUN apt-get install -y wget
-ARG DDL_URL
+ARG AMBARI_DDL_URL
 ADD pg_hba.conf /pg_hba.conf
 ADD scripts/* /docker-entrypoint-initdb.d/
 RUN mkdir /home/postgres

diff --git a/containers/postgres/scripts/100-ambari.sh b/containers/postgres/scripts/100-ambari.sh
@@ -2,8 +2,8 @@
 set -e
 
 cd ~/
-wget $DDL_URL
-sed -i "s/\${ambariSchemaVersion}/2.4.2/g" Ambari-DDL-Postgres-CREATE.sql
+wget https://raw.githubusercontent.com/apache/ambari/branch-2.5/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+sed -i "s/\${ambariSchemaVersion}/2.5.0/g" Ambari-DDL-Postgres-CREATE.sql
 
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
     create database ambari;

diff --git a/examples/compose/multi-container.yml b/examples/compose/multi-container.yml
@@ -1,10 +1,10 @@
-version: '2'
+version: '3'
 services:
   postgres.dev:
     build:
      context: ../../containers/postgres
      args:
-      - DDL_URL=${DDL_URL}
+      - AMBARI_DDL_URL=${AMBARI_DDL_URL}
     image: hdp/postgres
     networks:
      - dev

diff --git a/examples/compose/single-container.yml b/examples/compose/single-container.yml
@@ -1,15 +1,15 @@
-version: '2'
+version: '3'
 services:
   postgres.dev:
     build:
      context: ../../containers/postgres
      args:
-      - DDL_URL=${DDL_URL}
+      - AMBARI_DDL_URL=${AMBARI_DDL_URL}
     image: hdp/postgres
     networks:
      - dev
     environment:
-     - DDL_URL=${DDL_URL}
+     - AMBARI_DDL_URL=${AMBARI_DDL_URL}
     hostname: postgres
     domainname: dev
   ambari-server.dev: