You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ab...@apache.org on 2023/04/05 20:56:06 UTC
[ranger] branch ranger-4172 updated: Update compose files with args and dockerfiles with variables
This is an automated email from the ASF dual-hosted git repository.
abhi pushed a commit to branch ranger-4172
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-4172 by this push:
new 2b9b622fe Update compose files with args and dockerfiles with variables
2b9b622fe is described below
commit 2b9b622fe9d6cae1d3afebfc6e6eca6fd9df4dc5
Author: Abhishek Kumar <ab...@gmail.com>
AuthorDate: Wed Apr 5 16:54:31 2023 -0400
Update compose files with args and dockerfiles with variables
---
dev-support/ranger-docker/.env | 4 ++--
dev-support/ranger-docker/Dockerfile.ranger-base | 4 +++-
dev-support/ranger-docker/Dockerfile.ranger-mysql | 3 ++-
dev-support/ranger-docker/Dockerfile.ranger-postgres | 3 ++-
dev-support/ranger-docker/Dockerfile.ranger-solr | 3 ++-
dev-support/ranger-docker/Dockerfile.ranger-zk | 3 ++-
dev-support/ranger-docker/docker-compose.ranger-base.yml | 2 ++
dev-support/ranger-docker/docker-compose.ranger-mysql.yml | 2 ++
dev-support/ranger-docker/docker-compose.ranger-postgres.yml | 2 ++
dev-support/ranger-docker/docker-compose.ranger.yml | 4 ++++
10 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/dev-support/ranger-docker/.env b/dev-support/ranger-docker/.env
index 4eb77b7aa..1c9608ae9 100644
--- a/dev-support/ranger-docker/.env
+++ b/dev-support/ranger-docker/.env
@@ -4,11 +4,11 @@ GIT_URL=https://github.com/apache/ranger.git
BRANCH=master
PROFILE=
-# base & thirdparty images
+# base & third party images
UBUNTU_VERSION=20.04
MARIADB_VERSION=10.7.3
POSTGRES_VERSION=12
-ZOOKEEPER_VERSION=3.5.9
+ZK_VERSION=3.5.9
SOLR_VERSION=8
RANGER_VERSION=3.0.0-SNAPSHOT
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-base b/dev-support/ranger-docker/Dockerfile.ranger-base
index 52154868d..09df3824f 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-base
+++ b/dev-support/ranger-docker/Dockerfile.ranger-base
@@ -14,9 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM ubuntu:20.04
+ARG UBUNTU_VERSION
ARG TARGETARCH
+FROM ubuntu:${UBUNTU_VERSION}
+
# Install tzdata, Python, Java, python-requests
RUN apt-get update && \
DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata vim\
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-mysql b/dev-support/ranger-docker/Dockerfile.ranger-mysql
index 9ab3d4697..fd0eb22ef 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-mysql
+++ b/dev-support/ranger-docker/Dockerfile.ranger-mysql
@@ -14,7 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM mariadb:10.7.3
+ARG MARIADB_VERSION
+FROM mariadb:${MARIADB_VERSION}
# Copy DB init script
USER 0
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-postgres b/dev-support/ranger-docker/Dockerfile.ranger-postgres
index f33e813fe..c14666b62 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-postgres
+++ b/dev-support/ranger-docker/Dockerfile.ranger-postgres
@@ -14,7 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM postgres:12
+ARG POSTGRES_VERSION
+FROM postgres:${POSTGRES_VERSION}
# Copy DB init script
USER 0
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-solr b/dev-support/ranger-docker/Dockerfile.ranger-solr
index bcfb48807..8b212d4c5 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-solr
+++ b/dev-support/ranger-docker/Dockerfile.ranger-solr
@@ -14,7 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM solr:8
+ARG SOLR_VERSION
+FROM solr:${SOLR_VERSION}
# Copy audit config set
USER 0
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-zk b/dev-support/ranger-docker/Dockerfile.ranger-zk
index 2855b5014..b0fbf8588 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-zk
+++ b/dev-support/ranger-docker/Dockerfile.ranger-zk
@@ -14,4 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM zookeeper:3.5.9
+ARG ZK_VERSION
+FROM zookeeper:${ZK_VERSION}
diff --git a/dev-support/ranger-docker/docker-compose.ranger-base.yml b/dev-support/ranger-docker/docker-compose.ranger-base.yml
index d00740316..41b45936c 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-base.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-base.yml
@@ -4,6 +4,8 @@ services:
build:
context: .
dockerfile: Dockerfile.ranger-base
+ args:
+ - UBUNTU_VERSION=${UBUNTU_VERSION}
image: ranger-base
container_name: ranger-base
networks:
diff --git a/dev-support/ranger-docker/docker-compose.ranger-mysql.yml b/dev-support/ranger-docker/docker-compose.ranger-mysql.yml
index 0e739b766..b55099c74 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-mysql.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-mysql.yml
@@ -4,6 +4,8 @@ services:
build:
context: .
dockerfile: Dockerfile.ranger-mysql
+ args:
+ - MARIADB_VERSION=${MARIADB_VERSION}
image: ranger-mysql
command: --default-authentication-plugin=mysql_native_password
container_name: ranger-mysql
diff --git a/dev-support/ranger-docker/docker-compose.ranger-postgres.yml b/dev-support/ranger-docker/docker-compose.ranger-postgres.yml
index b9624aa21..f89168409 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-postgres.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-postgres.yml
@@ -4,6 +4,8 @@ services:
build:
context: .
dockerfile: Dockerfile.ranger-postgres
+ args:
+ - POSTGRES_VERSION=${POSTGRES_VERSION}
image: ranger-postgres
container_name: ranger-postgres
hostname: ranger-db.example.com
diff --git a/dev-support/ranger-docker/docker-compose.ranger.yml b/dev-support/ranger-docker/docker-compose.ranger.yml
index c857e6b0c..dfdb863e7 100644
--- a/dev-support/ranger-docker/docker-compose.ranger.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger.yml
@@ -33,6 +33,8 @@ services:
build:
context: .
dockerfile: Dockerfile.ranger-zk
+ args:
+ - ZK_VERSION=${ZK_VERSION}
image: ranger-zk
container_name: ranger-zk
hostname: ranger-zk.example.com
@@ -45,6 +47,8 @@ services:
build:
context: .
dockerfile: Dockerfile.ranger-solr
+ args:
+ - SOLR_VERSION=${SOLR_VERSION}
image: ranger-solr
container_name: ranger-solr
hostname: ranger-solr.example.com