From: Jérôme Benoit Date: Sat, 25 Feb 2023 13:42:09 +0000 (+0100) Subject: Fix docker compose file syntax X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=e72a75113887c1c1e74b626c3824d15713eadafb;p=mbt-docker.git Fix docker compose file syntax Signed-off-by: Jérôme Benoit --- diff --git a/Dockerfile b/Dockerfile index 6950d12..71d4e38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -153,7 +153,7 @@ RUN sapmachine_install() { \ apt-get install -y ca-certificates curl libarchive-tools --no-install-recommends; \ rm -rf /var/lib/apt/lists/*; \ curl -fsSLO --compressed -b 'eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt' https://tools.hana.ondemand.com/additional/sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip; \ - echo "583dedfeee0c119839a610ddc8c6768d0c044429 sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip" | sha1sum -c -; \ + echo "0f0d71f95ea016d8e81bed94bf5d53ad8e1d7198 sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip" | sha1sum -c -; \ bsdtar -xvf sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip -C /usr/local --strip-components=1 --no-same-owner; \ rm -f sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip; \ apt-get remove --purge --auto-remove -y ca-certificates curl libarchive-tools; \ diff --git a/Makefile b/Makefile index d181f73..d1f269f 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,10 @@ ifeq '$(SUBMODULES_INIT)' 'true' endif $(NAME): $(submodules-init) - docker-compose -p $(PROJECT_NAME) up -d $(NAME) + docker compose -p $(PROJECT_NAME) up -d $(NAME) $(NAME)-force: $(submodules-init) - docker-compose -p $(PROJECT_NAME) up -d --build --force-recreate $(NAME) + docker compose -p $(PROJECT_NAME) up -d --build --force-recreate $(NAME) all: $(NAME) @@ -30,7 +30,7 @@ clean-images: -docker rmi $(PROJECT_NAME)-$(NAME) clean-containers: - -docker-compose -p $(PROJECT_NAME) down + -docker compose -p $(PROJECT_NAME) down clean: clean-containers clean-images diff --git a/docker-compose.yml b/docker-compose.yml index 4a8ea00..fe06fa0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,84 +3,96 @@ services: mbt-node18-java8-docker: platform: linux/amd64 build: + context: . + dockerfile: Dockerfile args: NODE_VERSION: 18.14.1 - SAPMACHINE_VERSION: 8.1.091 - dockerfile: Dockerfile + SAPMACHINE_VERSION: 8.1.092 mbt-node16-java8-docker: platform: linux/amd64 build: + context: . + dockerfile: Dockerfile args: NODE_VERSION: 16.19.1 - SAPMACHINE_VERSION: 8.1.091 - dockerfile: Dockerfile + SAPMACHINE_VERSION: 8.1.092 mbt-node14-java8-docker: platform: linux/amd64 build: + context: . + dockerfile: Dockerfile args: NODE_VERSION: 14.21.3 - SAPMACHINE_VERSION: 8.1.091 - dockerfile: Dockerfile + SAPMACHINE_VERSION: 8.1.092 mbt-node18-java11-docker: platform: linux/amd64 build: + context: . + dockerfile: Dockerfile args: NODE_VERSION: 18.14.1 SAPMACHINE_VERSION: 11.0.18 - dockerfile: Dockerfile mbt-node16-java11-docker: platform: linux/amd64 build: + context: . + dockerfile: Dockerfile args: NODE_VERSION: 16.19.1 SAPMACHINE_VERSION: 11.0.18 - dockerfile: Dockerfile mbt-node14-java11-docker: platform: linux/amd64 build: + context: . + dockerfile: Dockerfile args: NODE_VERSION: 14.21.3 SAPMACHINE_VERSION: 11.0.18 - dockerfile: Dockerfile mbt-node18-java17-docker: platform: linux/amd64 build: + context: . + dockerfile: Dockerfile args: NODE_VERSION: 18.14.1 SAPMACHINE_VERSION: 17.0.6 - dockerfile: Dockerfile mbt-node16-java17-docker: platform: linux/amd64 build: + context: . + dockerfile: Dockerfile args: NODE_VERSION: 16.19.1 SAPMACHINE_VERSION: 17.0.6 - dockerfile: Dockerfile mbt-node14-java17-docker: platform: linux/amd64 build: + context: . + dockerfile: Dockerfile args: NODE_VERSION: 14.21.3 SAPMACHINE_VERSION: 17.0.6 - dockerfile: Dockerfile mbt-node18-java19-docker: platform: linux/amd64 build: + context: . + dockerfile: Dockerfile args: NODE_VERSION: 18.14.1 SAPMACHINE_VERSION: 19.0.2 - dockerfile: Dockerfile mbt-node16-java19-docker: platform: linux/amd64 build: + context: . + dockerfile: Dockerfile args: NODE_VERSION: 16.19.1 SAPMACHINE_VERSION: 19.0.2 - dockerfile: Dockerfile mbt-node14-java19-docker: platform: linux/amd64 build: + context: . + dockerfile: Dockerfile args: NODE_VERSION: 14.21.3 SAPMACHINE_VERSION: 19.0.2 - dockerfile: Dockerfile