Skip to content

Commit

Permalink
HDDS-11590. Unexpected character - in Docker Compose env_file variabl…
Browse files Browse the repository at this point in the history
…e names (#38)
  • Loading branch information
adoroszlai authored Jan 13, 2025
1 parent b38e543 commit b214870
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 63 deletions.
19 changes: 0 additions & 19 deletions .env

This file was deleted.

47 changes: 32 additions & 15 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
29 changes: 0 additions & 29 deletions docker-config

This file was deleted.

0 comments on commit b214870

Please sign in to comment.