diff --git a/ambari/Dockerfile b/ambari/Dockerfile index f360965..408dfec 100644 --- a/ambari/Dockerfile +++ b/ambari/Dockerfile @@ -2,10 +2,33 @@ # Dockerfile for ambari # +FROM ubuntu:18.04 AS build + +ENV AMBARI_VERSION=2.7.6 +ENV AMBARI_BUILD_NUMBER=388e072381e71c7755673b7743531c03a4d61be8 + +SHELL ["/bin/bash", "-c"] + +RUN set -xe \ + && apt-get update \ + && apt-get install -y python maven node npm wget \ + && npm install --global yarn \ + && wget https://www-eu.apache.org/dist/ambari/ambari-$AMBARI_VERSION/apache-ambari-$AMBARI_VERSION-src.tar.gz \ + && tar xfvz apache-ambari-$AMBARI_VERSION-src.tar.gz \ + && cd apache-ambari-$AMBARI_VERSION-src \ + && mvn versions:set -DnewVersion=$AMBARI_VERSION.0.0 \ + && pushd ambari-metrics \ + && mvn versions:set -DnewVersion=$AMBARI_VERSION.0.0 \ + && popd \ + && mvn -B clean install jdeb:jdeb -DnewVersion=$AMBARI_VERSION.0.0 -DbuildNumber=$AMBARI_BUILD_NUMBER -DskipTests -Dpython.ver="python >= 2.6" \ + && find . -name '*.deb' + +# TODO + FROM ubuntu:18.04 MAINTAINER EasyPi Software Foundation -ENV AMBARI_VERSION=2.7.5.0 +ENV AMBARI_VERSION=2.7.6.0 ENV AMBARI_SOURCE=http://public-repo-1.hortonworks.com/ambari/ubuntu18/2.x/updates/${AMBARI_VERSION}/ambari.list ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 diff --git a/ambari/docker-compose.yml b/ambari/docker-compose.yml index 535c064..0db14cb 100644 --- a/ambari/docker-compose.yml +++ b/ambari/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" services: @@ -21,7 +21,7 @@ services: restart: unless-stopped postgres: - image: postgres:alpine + image: postgres:14-alpine volumes: - ./data/postgres:/var/lib/postgresql/data environment: diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml index 2211482..f2bf610 100644 --- a/semaphore/docker-compose.yml +++ b/semaphore/docker-compose.yml @@ -9,11 +9,12 @@ services: volumes: - ./data/semaphore:/etc/semaphore environment: + SEMAPHORE_DB_DIALECT: postgres SEMAPHORE_DB_USER: semaphore SEMAPHORE_DB_PASS: semaphore SEMAPHORE_DB_HOST: postgres - SEMAPHORE_DB_PORT: 3306 - SEMAPHORE_DB: semaphore + SEMAPHORE_DB_PORT: 5432 + SEMAPHORE_DB: semaphore?sslmode=disable SEMAPHORE_PLAYBOOK_PATH: /tmp/semaphore/ SEMAPHORE_ADMIN: admin SEMAPHORE_ADMIN_NAME: admin