This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch latest
in repository https://gitbox.apache.org/repos/asf/ozone-docker.git
The following commit(s) were added to refs/heads/latest by this push:
new b214870 HDDS-11590. Unexpected character - in Docker Compose env_file
variable names (#38)
b214870 is described below
commit b2148701a20454fd41176aa6f75697c0b1f18a5b
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Jan 13 17:49:08 2025 +0100
HDDS-11590. Unexpected character - in Docker Compose env_file variable
names (#38)
---
.env | 19 -------------------
docker-compose.yaml | 47 ++++++++++++++++++++++++++++++++---------------
docker-config | 29 -----------------------------
3 files changed, 32 insertions(+), 63 deletions(-)
diff --git a/.env b/.env
deleted file mode 100644
index 5d58e0b..0000000
--- a/.env
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-OZONE_IMAGE=apache/ozone
-OZONE_IMAGE_FLAVOR=-rocky
-OZONE_IMAGE_VERSION=1.4.1
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b91cfaf..21874fc 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -14,45 +14,62 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+x-image:
+ &image
+ image:
${OZONE_IMAGE:-apache/ozone}:${OZONE_IMAGE_VERSION:-1.4.1}${OZONE_IMAGE_FLAVOR:--rocky}
+
+x-common-config:
+ &common-config
+ OZONE-SITE.XML_hdds.datanode.dir: "/data/hdds"
+ OZONE-SITE.XML_ozone.metadata.dirs: "/data/metadata"
+ OZONE-SITE.XML_ozone.om.address: "om"
+ OZONE-SITE.XML_ozone.om.http-address: "om:9874"
+ OZONE-SITE.XML_ozone.recon.address: "recon:9891"
+ OZONE-SITE.XML_ozone.recon.db.dir: "/data/metadata/recon"
+ OZONE-SITE.XML_ozone.replication: "1"
+ OZONE-SITE.XML_ozone.scm.block.client.address: "scm"
+ OZONE-SITE.XML_ozone.scm.client.address: "scm"
+ OZONE-SITE.XML_ozone.scm.datanode.id.dir: "/data"
+ OZONE-SITE.XML_ozone.scm.names: "scm"
+ no_proxy: "om,recon,scm,s3g,localhost,127.0.0.1"
+
version: "3"
services:
datanode:
- image: ${OZONE_IMAGE}:${OZONE_IMAGE_VERSION}${OZONE_IMAGE_FLAVOR}
+ <<: *image
ports:
- 9864
command: ["ozone","datanode"]
- env_file:
- - ./docker-config
+ environment:
+ <<: *common-config
om:
- image: ${OZONE_IMAGE}:${OZONE_IMAGE_VERSION}${OZONE_IMAGE_FLAVOR}
+ <<: *image
ports:
- 9874:9874
environment:
+ <<: *common-config
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
WAITFOR: scm:9876
- env_file:
- - ./docker-config
command: ["ozone","om"]
scm:
- image: ${OZONE_IMAGE}:${OZONE_IMAGE_VERSION}${OZONE_IMAGE_FLAVOR}
+ <<: *image
ports:
- 9876:9876
- env_file:
- - ./docker-config
environment:
+ <<: *common-config
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
command: ["ozone","scm"]
recon:
- image: ${OZONE_IMAGE}:${OZONE_IMAGE_VERSION}${OZONE_IMAGE_FLAVOR}
+ <<: *image
ports:
- 9888:9888
- env_file:
- - ./docker-config
+ environment:
+ <<: *common-config
command: ["ozone","recon"]
s3g:
- image: ${OZONE_IMAGE}:${OZONE_IMAGE_VERSION}${OZONE_IMAGE_FLAVOR}
+ <<: *image
ports:
- 9878:9878
- env_file:
- - ./docker-config
+ environment:
+ <<: *common-config
command: ["ozone","s3g"]
diff --git a/docker-config b/docker-config
deleted file mode 100644
index 5a61be2..0000000
--- a/docker-config
+++ /dev/null
@@ -1,29 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-OZONE-SITE.XML_ozone.om.address=om
-OZONE-SITE.XML_ozone.om.http-address=om:9874
-OZONE-SITE.XML_ozone.scm.names=scm
-OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data
-OZONE-SITE.XML_ozone.scm.block.client.address=scm
-OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata
-OZONE-SITE.XML_ozone.scm.client.address=scm
-OZONE-SITE.XML_ozone.replication=1
-OZONE-SITE.XML_ozone.scm.client.address=scm
-OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
-OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
-OZONE-SITE.XML_ozone.recon.address=recon:9891
-no_proxy=om,recon,scm,s3g,localhost,127.0.0.1
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
