diff --git a/release/package/centos-7/Dockerfile b/release/package/centos-7/Dockerfile index ff3b57033..9d7922a5b 100644 --- a/release/package/centos-7/Dockerfile +++ b/release/package/centos-7/Dockerfile @@ -1,12 +1,14 @@ FROM centos:7 +ARG TOOLCHAIN_VERSION + RUN yum -y update \ && yum install -y wget git # Do NOT be smart here and clean the cache because the container is used in the # stateful context. -RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/toolchain-v2/toolchain-v2-binaries-centos-7.tar.gz \ - -O toolchain-v2-binaries-centos-7.tar.gz \ - && tar xzvf toolchain-v2-binaries-centos-7.tar.gz -C /opt +RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-centos-7.tar.gz \ + -O ${TOOLCHAIN_VERSION}-binaries-centos-7.tar.gz \ + && tar xzvf ${TOOLCHAIN_VERSION}-binaries-centos-7.tar.gz -C /opt ENTRYPOINT ["sleep", "infinity"] diff --git a/release/package/centos-8/Dockerfile b/release/package/centos-8/Dockerfile index 724387e2a..e9a1b556d 100644 --- a/release/package/centos-8/Dockerfile +++ b/release/package/centos-8/Dockerfile @@ -1,12 +1,14 @@ FROM centos:8 +ARG TOOLCHAIN_VERSION + RUN dnf -y update \ && dnf install -y wget git # Do NOT be smart here and clean the cache because the container is used in the # stateful context. -RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/toolchain-v2/toolchain-v2-binaries-centos-8.tar.gz \ - -O toolchain-v2-binaries-centos-8.tar.gz \ - && tar xzvf toolchain-v2-binaries-centos-8.tar.gz -C /opt +RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-centos-8.tar.gz \ + -O ${TOOLCHAIN_VERSION}-binaries-centos-8.tar.gz \ + && tar xzvf ${TOOLCHAIN_VERSION}-binaries-centos-8.tar.gz -C /opt ENTRYPOINT ["sleep", "infinity"] diff --git a/release/package/debian-10/Dockerfile b/release/package/debian-10/Dockerfile index f6ff36235..f59616439 100644 --- a/release/package/debian-10/Dockerfile +++ b/release/package/debian-10/Dockerfile @@ -1,5 +1,7 @@ FROM debian:10 +ARG TOOLCHAIN_VERSION + # Stops tzdata interactive configuration. ENV DEBIAN_FRONTEND=noninteractive @@ -8,8 +10,8 @@ RUN apt update && apt install -y \ # Do NOT be smart here and clean the cache because the container is used in the # stateful context. -RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/toolchain-v2/toolchain-v2-binaries-debian-10.tar.gz \ - -O toolchain-v2-binaries-debian-10.tar.gz \ - && tar xzvf toolchain-v2-binaries-debian-10.tar.gz -C /opt +RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-debian-10.tar.gz \ + -O ${TOOLCHAIN_VERSION}-binaries-debian-10.tar.gz \ + && tar xzvf ${TOOLCHAIN_VERSION}-binaries-debian-10.tar.gz -C /opt ENTRYPOINT ["sleep", "infinity"] diff --git a/release/package/debian-9/Dockerfile b/release/package/debian-9/Dockerfile index fd49077ce..057e3d1ae 100644 --- a/release/package/debian-9/Dockerfile +++ b/release/package/debian-9/Dockerfile @@ -1,5 +1,7 @@ FROM debian:9 +ARG TOOLCHAIN_VERSION + # Stops tzdata interactive configuration. ENV DEBIAN_FRONTEND=noninteractive @@ -8,8 +10,8 @@ RUN apt update && apt install -y \ # Do NOT be smart here and clean the cache because the container is used in the # stateful context. -RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/toolchain-v2/toolchain-v2-binaries-debian-9.tar.gz \ - -O toolchain-v2-binaries-debian-9.tar.gz \ - && tar xzvf toolchain-v2-binaries-debian-9.tar.gz -C /opt +RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-debian-9.tar.gz \ + -O ${TOOLCHAIN_VERSION}-binaries-debian-9.tar.gz \ + && tar xzvf ${TOOLCHAIN_VERSION}-binaries-debian-9.tar.gz -C /opt ENTRYPOINT ["sleep", "infinity"] diff --git a/release/package/run.sh b/release/package/run.sh index 151d48712..fa980c7a2 100755 --- a/release/package/run.sh +++ b/release/package/run.sh @@ -6,7 +6,8 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" SUPPORTED_OFFERING=(community enterprise) SUPPORTED_OS=(centos-7 centos-8 debian-9 debian-10 ubuntu-18.04 ubuntu-20.04) PROJECT_ROOT="$SCRIPT_DIR/../.." -ACTIVATE_TOOLCHAIN="source /opt/toolchain-v2/activate" +TOOLCHAIN_VERSION="toolchain-v3" +ACTIVATE_TOOLCHAIN="source /opt/${TOOLCHAIN_VERSION}/activate" HOST_OUTPUT_DIR="$PROJECT_ROOT/build/output" print_help () { @@ -94,7 +95,7 @@ make_package () { case "$1" in init) cd "$SCRIPT_DIR" - docker-compose build + docker-compose build --build-arg TOOLCHAIN_VERSION="${TOOLCHAIN_VERSION}" docker-compose up -d ;; diff --git a/release/package/ubuntu-18.04/Dockerfile b/release/package/ubuntu-18.04/Dockerfile index dc876be77..6222de609 100644 --- a/release/package/ubuntu-18.04/Dockerfile +++ b/release/package/ubuntu-18.04/Dockerfile @@ -1,5 +1,7 @@ FROM ubuntu:18.04 +ARG TOOLCHAIN_VERSION + # Stops tzdata interactive configuration. ENV DEBIAN_FRONTEND=noninteractive @@ -8,8 +10,8 @@ RUN apt update && apt install -y \ # Do NOT be smart here and clean the cache because the container is used in the # stateful context. -RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/toolchain-v2/toolchain-v2-binaries-ubuntu-18.04.tar.gz \ - -O toolchain-v2-binaries-ubuntu-18.04.tar.gz \ - && tar xzvf toolchain-v2-binaries-ubuntu-18.04.tar.gz -C /opt +RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-ubuntu-18.04.tar.gz \ + -O ${TOOLCHAIN_VERSION}-binaries-ubuntu-18.04.tar.gz \ + && tar xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-18.04.tar.gz -C /opt ENTRYPOINT ["sleep", "infinity"] diff --git a/release/package/ubuntu-20.04/Dockerfile b/release/package/ubuntu-20.04/Dockerfile index c3773ec6f..148876e2b 100644 --- a/release/package/ubuntu-20.04/Dockerfile +++ b/release/package/ubuntu-20.04/Dockerfile @@ -1,5 +1,7 @@ FROM ubuntu:20.04 +ARG TOOLCHAIN_VERSION + # Stops tzdata interactive configuration. ENV DEBIAN_FRONTEND=noninteractive @@ -8,8 +10,8 @@ RUN apt update && apt install -y \ # Do NOT be smart here and clean the cache because the container is used in the # stateful context. -RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/toolchain-v2/toolchain-v2-binaries-ubuntu-20.04.tar.gz \ - -O toolchain-v2-binaries-ubuntu-20.04.tar.gz \ - && tar xzvf toolchain-v2-binaries-ubuntu-20.04.tar.gz -C /opt +RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-ubuntu-20.04.tar.gz \ + -O ${TOOLCHAIN_VERSION}-binaries-ubuntu-20.04.tar.gz \ + && tar xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-20.04.tar.gz -C /opt ENTRYPOINT ["sleep", "infinity"]