From 919f07fae15256535ed931d2fa5912a5899cec8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Budiseli=C4=87?= Date: Sat, 22 Jul 2023 19:20:10 +0200 Subject: [PATCH] Add macOS support under environment/util.sh:operating_system (#1098) * Fix release/package ubuntu-22.04 amd64 Dockerfile --- environment/util.sh | 11 +++++++++-- release/package/ubuntu-22.04/Dockerfile | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/environment/util.sh b/environment/util.sh index be0952c42..a7814094e 100644 --- a/environment/util.sh +++ b/environment/util.sh @@ -1,8 +1,15 @@ #!/bin/bash function operating_system() { - grep -E '^(VERSION_)?ID=' /etc/os-release | \ - sort | cut -d '=' -f 2- | sed 's/"//g' | paste -s -d '-' + if [[ "$OSTYPE" == "linux-gnu"* ]]; then + grep -E '^(VERSION_)?ID=' /etc/os-release | \ + sort | cut -d '=' -f 2- | sed 's/"//g' | paste -s -d '-' + elif [[ "$OSTYPE" == "darwin"* ]]; then + echo "$(sw_vers -productName)-$(sw_vers -productVersion | cut -d '.' -f 1)" + else + echo "operating_system called on an unknown OS" + exit 1 + fi } function check_operating_system() { diff --git a/release/package/ubuntu-22.04/Dockerfile b/release/package/ubuntu-22.04/Dockerfile index f08f364cf..6bd22589b 100644 --- a/release/package/ubuntu-22.04/Dockerfile +++ b/release/package/ubuntu-22.04/Dockerfile @@ -13,6 +13,6 @@ RUN apt update && apt install -y \ RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-amd64.tar.gz \ -O ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-amd64.tar.gz \ && tar xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-amd64.tar.gz -C /opt \ - && rm xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-amd64.tar.gz + && rm ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-amd64.tar.gz ENTRYPOINT ["sleep", "infinity"]