From cc776c8b447b988b0bcaa45d9f0c3441ee0a880f Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 7 Nov 2018 17:56:31 -0800 Subject: [PATCH] Set up docker for arcade --- build.sh | 2 +- {old/scripts/common => eng}/_prettyprint.sh | 0 .../docker/alpine.3.6/Dockerfile | 0 {old/scripts => eng}/docker/centos/Dockerfile | 0 {old/scripts => eng}/docker/debian/Dockerfile | 0 .../docker/fedora.23/Dockerfile | 0 .../docker/fedora.24/Dockerfile | 0 .../docker/fedora.27/Dockerfile | 0 .../docker/opensuse.13.2/Dockerfile | 0 .../docker/opensuse.42.1/Dockerfile | 0 .../docker/opensuse.42.3/Dockerfile | 0 {old/scripts => eng}/docker/rhel.6/Dockerfile | 0 {old/scripts => eng}/docker/rhel/Dockerfile | 0 .../docker/ubuntu.14.04/Dockerfile | 0 .../docker/ubuntu.16.04/Dockerfile | 0 .../docker/ubuntu.16.10/Dockerfile | 0 .../docker/ubuntu.18.04/Dockerfile | 0 {old/scripts => eng}/dockerrun.sh | 22 +++++++++---------- run-build.sh | 2 +- 19 files changed, 13 insertions(+), 13 deletions(-) rename {old/scripts/common => eng}/_prettyprint.sh (100%) rename {old/scripts => eng}/docker/alpine.3.6/Dockerfile (100%) rename {old/scripts => eng}/docker/centos/Dockerfile (100%) rename {old/scripts => eng}/docker/debian/Dockerfile (100%) rename {old/scripts => eng}/docker/fedora.23/Dockerfile (100%) rename {old/scripts => eng}/docker/fedora.24/Dockerfile (100%) rename {old/scripts => eng}/docker/fedora.27/Dockerfile (100%) rename {old/scripts => eng}/docker/opensuse.13.2/Dockerfile (100%) rename {old/scripts => eng}/docker/opensuse.42.1/Dockerfile (100%) rename {old/scripts => eng}/docker/opensuse.42.3/Dockerfile (100%) rename {old/scripts => eng}/docker/rhel.6/Dockerfile (100%) rename {old/scripts => eng}/docker/rhel/Dockerfile (100%) rename {old/scripts => eng}/docker/ubuntu.14.04/Dockerfile (100%) rename {old/scripts => eng}/docker/ubuntu.16.04/Dockerfile (100%) rename {old/scripts => eng}/docker/ubuntu.16.10/Dockerfile (100%) rename {old/scripts => eng}/docker/ubuntu.18.04/Dockerfile (100%) rename {old/scripts => eng}/dockerrun.sh (89%) mode change 100644 => 100755 mode change 100644 => 100755 run-build.sh diff --git a/build.sh b/build.sh index 99a136aa7f64..07d6c9911b49 100755 --- a/build.sh +++ b/build.sh @@ -43,7 +43,7 @@ done dockerbuild() { - BUILD_COMMAND=/opt/code/run-build.sh $DIR/scripts/dockerrun.sh --non-interactive "$@" + BUILD_COMMAND=/opt/code/run-build.sh $DIR/eng/dockerrun.sh --non-interactive "$@" } # Check if we need to build in docker diff --git a/old/scripts/common/_prettyprint.sh b/eng/_prettyprint.sh similarity index 100% rename from old/scripts/common/_prettyprint.sh rename to eng/_prettyprint.sh diff --git a/old/scripts/docker/alpine.3.6/Dockerfile b/eng/docker/alpine.3.6/Dockerfile similarity index 100% rename from old/scripts/docker/alpine.3.6/Dockerfile rename to eng/docker/alpine.3.6/Dockerfile diff --git a/old/scripts/docker/centos/Dockerfile b/eng/docker/centos/Dockerfile similarity index 100% rename from old/scripts/docker/centos/Dockerfile rename to eng/docker/centos/Dockerfile diff --git a/old/scripts/docker/debian/Dockerfile b/eng/docker/debian/Dockerfile similarity index 100% rename from old/scripts/docker/debian/Dockerfile rename to eng/docker/debian/Dockerfile diff --git a/old/scripts/docker/fedora.23/Dockerfile b/eng/docker/fedora.23/Dockerfile similarity index 100% rename from old/scripts/docker/fedora.23/Dockerfile rename to eng/docker/fedora.23/Dockerfile diff --git a/old/scripts/docker/fedora.24/Dockerfile b/eng/docker/fedora.24/Dockerfile similarity index 100% rename from old/scripts/docker/fedora.24/Dockerfile rename to eng/docker/fedora.24/Dockerfile diff --git a/old/scripts/docker/fedora.27/Dockerfile b/eng/docker/fedora.27/Dockerfile similarity index 100% rename from old/scripts/docker/fedora.27/Dockerfile rename to eng/docker/fedora.27/Dockerfile diff --git a/old/scripts/docker/opensuse.13.2/Dockerfile b/eng/docker/opensuse.13.2/Dockerfile similarity index 100% rename from old/scripts/docker/opensuse.13.2/Dockerfile rename to eng/docker/opensuse.13.2/Dockerfile diff --git a/old/scripts/docker/opensuse.42.1/Dockerfile b/eng/docker/opensuse.42.1/Dockerfile similarity index 100% rename from old/scripts/docker/opensuse.42.1/Dockerfile rename to eng/docker/opensuse.42.1/Dockerfile diff --git a/old/scripts/docker/opensuse.42.3/Dockerfile b/eng/docker/opensuse.42.3/Dockerfile similarity index 100% rename from old/scripts/docker/opensuse.42.3/Dockerfile rename to eng/docker/opensuse.42.3/Dockerfile diff --git a/old/scripts/docker/rhel.6/Dockerfile b/eng/docker/rhel.6/Dockerfile similarity index 100% rename from old/scripts/docker/rhel.6/Dockerfile rename to eng/docker/rhel.6/Dockerfile diff --git a/old/scripts/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile similarity index 100% rename from old/scripts/docker/rhel/Dockerfile rename to eng/docker/rhel/Dockerfile diff --git a/old/scripts/docker/ubuntu.14.04/Dockerfile b/eng/docker/ubuntu.14.04/Dockerfile similarity index 100% rename from old/scripts/docker/ubuntu.14.04/Dockerfile rename to eng/docker/ubuntu.14.04/Dockerfile diff --git a/old/scripts/docker/ubuntu.16.04/Dockerfile b/eng/docker/ubuntu.16.04/Dockerfile similarity index 100% rename from old/scripts/docker/ubuntu.16.04/Dockerfile rename to eng/docker/ubuntu.16.04/Dockerfile diff --git a/old/scripts/docker/ubuntu.16.10/Dockerfile b/eng/docker/ubuntu.16.10/Dockerfile similarity index 100% rename from old/scripts/docker/ubuntu.16.10/Dockerfile rename to eng/docker/ubuntu.16.10/Dockerfile diff --git a/old/scripts/docker/ubuntu.18.04/Dockerfile b/eng/docker/ubuntu.18.04/Dockerfile similarity index 100% rename from old/scripts/docker/ubuntu.18.04/Dockerfile rename to eng/docker/ubuntu.18.04/Dockerfile diff --git a/old/scripts/dockerrun.sh b/eng/dockerrun.sh old mode 100644 new mode 100755 similarity index 89% rename from old/scripts/dockerrun.sh rename to eng/dockerrun.sh index 1ffd92ee6335..e73d440e0a44 --- a/old/scripts/dockerrun.sh +++ b/eng/dockerrun.sh @@ -38,7 +38,7 @@ while [[ $# > 0 ]]; do echo "" echo "Options:" echo " The path to the Dockerfile to use to create the build container" - echo " The name of an existing Dockerfile folder under scripts/docker to use as the Dockerfile" + echo " The name of an existing Dockerfile folder under eng/docker to use as the Dockerfile" echo " The command to run once inside the container (/opt/code is mapped to the repo root; defaults to nothing, which runs the default shell)" exit 0 ;; @@ -54,44 +54,44 @@ if [ -z "$DOCKERFILE" ]; then if [ -z "$DOCKER_IMAGENAME" ]; then if [ "$(uname)" == "Darwin" ]; then echo "Defaulting to 'ubuntu' image for Darwin" - export DOCKERFILE=scripts/docker/ubuntu + export DOCKERFILE=eng/docker/ubuntu elif [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then echo "Detected current OS as Ubuntu, determining ubuntu version to use..." if [ "$(cat /etc/*-release | grep -cim1 16.04)" -eq 1 ]; then echo "using 'ubuntu.16.04' image" - export DOCKERFILE=scripts/docker/ubuntu.16.04 + export DOCKERFILE=eng/docker/ubuntu.16.04 else echo "using 'ubuntu' image" - export DOCKERFILE=scripts/docker/ubuntu + export DOCKERFILE=eng/docker/ubuntu fi elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then echo "Detected current OS as CentOS, using 'centos' image" - export DOCKERFILE=scripts/docker/centos + export DOCKERFILE=eng/docker/centos elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then echo "Detected current OS as rhel, using 'rhel' image" - export DOCKERFILE=scripts/docker/rhel + export DOCKERFILE=eng/docker/rhel elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then echo "Detected current OS as Debian, using 'debian' image" - export DOCKERFILE=scripts/docker/debian + export DOCKERFILE=eng/docker/debian elif [ "$(cat /etc/*-release | grep -cim1 fedora)" -eq 1 ]; then echo "Detected current OS as Fedora, determining fedora version to use..." if [ "$(cat /etc/*-release | grep -cim1 23)" -eq 1 ]; then echo "using 'fedora.23' image" - export DOCKERFILE=scripts/docker/fedora.23 + export DOCKERFILE=eng/docker/fedora.23 fi elif [ "$(cat /etc/*-release | grep -cim1 opensuse)" -eq 1 ]; then echo "Detected current OS as openSUSE, determining openSUSE version to use..." if [ "$(cat /etc/*-release | grep -cim1 13.2)" -eq 1 ]; then echo "using 'openSUSE.13.2' image" - export DOCKERFILE=scripts/docker/opensuse.13.2 + export DOCKERFILE=eng/docker/opensuse.13.2 fi else echo "Unknown Linux Distro. Using 'ubuntu' image" - export DOCKERFILE=scripts/docker/ubuntu + export DOCKERFILE=eng/docker/ubuntu fi else echo "Using requested image: $DOCKER_IMAGENAME" - export DOCKERFILE="scripts/docker/$DOCKER_IMAGENAME" + export DOCKERFILE="eng/docker/$DOCKER_IMAGENAME" fi fi diff --git a/run-build.sh b/run-build.sh old mode 100644 new mode 100755 index fc876e0ae5c2..bc5e22bdd2a1 --- a/run-build.sh +++ b/run-build.sh @@ -17,7 +17,7 @@ REPOROOT="$DIR" ARCHITECTURE="x64" -source "$REPOROOT/scripts/common/_prettyprint.sh" +source "$REPOROOT/eng/_prettyprint.sh" LINUX_PORTABLE_INSTALL_ARGS= CUSTOM_BUILD_ARGS=