Add Dockerfile and Dockertag generation from templates

.gitignore

@@ -0,0 +1 @@
+.vscode/

build-all.bash

@@ -1,23 +1,15 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
+set -vex
 
-# This script builds all Docker containers described by Dockerfiles in this repository
-# For each Dockerfile it runs: 
-# $ docker build -t $TAGPREFIX/$TAG 
-# and
-# $ docker push -t $TAGPREFIX/$TAG
-#
-# $TAGPREFIX is defined in this file. 
-# If a Dockerfile has a Dockertag file in the same directory, it's read from there
-# Otherwise $TAG is generated by replacing / and <space> with - in the directory name. 
-#
-# docker build command uses --no-cache option to prevent stale layers to be used. 
+HERE="$( cd "$(dirname "$0")" ; pwd -P )"
+
+export RELEASE_HASH="${RELEASE_HASH:-$(curl -s https://api.github.com/repos/iterative/dvc/releases/latest | sha256sum | cut -c -8)}"
+export TAG_PREFIX="${TAG_PREFIX:-dvcorg}"
 
-set -vex
 
-RELEASE_HASH=$(curl -s https://api.github.com/repos/iterative/dvc/releases/latest | sha256sum | cut -c -8)
+./generate-all.bash
 
-TAGPREFIX=dvcorg
 DIR=$(dirname $0)
 cd "${DIR}"
 
@@ -29,8 +21,6 @@ find $DIR -name Dockerfile | sort | while read -r filepath ; do
     else
         TAG=$(echo "${dockerdir}[3,100]}" | tr '/ ' '--')
     fi
-    echo "BUILDING: ${dockerdir} with the tag: ${TAGPREFIX}/${TAG}"
-    docker build --build-arg RELEASE_HASH=${RELEASE_HASH} -t ${TAGPREFIX}/${TAG} ${dockerdir}/
-    echo "PUSHING: ${dockerdir} with the tag: ${TAGPREFIX}/${TAG}"
-    docker push ${TAGPREFIX}/${TAG}
+    echo "BUILDING: ${dockerdir} with the tag: ${TAG_PREFIX}/${TAG}"
+    docker build --build-arg RELEASE_HASH=${RELEASE_HASH} -t ${TAG_PREFIX}/${TAG} ${dockerdir}/
 done

generate-all.bash

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -vex
+
+HERE="$( cd "$(dirname "$0")" ; pwd -P )"
+export RELEASE_HASH="${RELEASE_HASH:-$(curl -s https://api.github.com/repos/iterative/dvc/releases/latest | sha256sum | cut -c -8)}"
+export TAG_PREFIX="${TAG_PREFIX:-dvcorg}"
+
+DIR=$(dirname $0)
+cd "${DIR}"
+
+find ${DIR} -name generate.* | sort | while read -r filepath ; do 
+    filename=$(basename -- "$filepath")
+    dirname=$(dirname -- "$filepath")
+    ext="${filename##*.}"
+    cd $dirname
+    if [[ "$ext" == "bash" ]] ; then
+        bash "$filename"
+    elif [[ "$ext" == "sh" ]] ; then
+        sh "$filename" 
+    elif [[ "$ext" == "zsh" ]] ; then
+        zsh "$filename"
+    elif [[ "$ext" == "py" ]] ; then
+        python "$filename" 
+    else
+        echo "UNSUPPORTED GENERATOR SCRIPT: $filepath"
+    fi
+    cd -
+done
+

katacoda/.gitignore

@@ -0,0 +1,2 @@
+dvc-get-started/
+build/

katacoda/Dockerfile → katacoda/base/Dockerfile.template

@@ -5,7 +5,6 @@ WORKDIR /root
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 
-ARG RELEASE_HASH
 RUN RELEASE_HASH=${RELEASE_HASH} \
     apt-get update -y && apt-get install -y \
                          gnupg \

katacoda/base/Dockertag.template

@@ -0,0 +1 @@
+${TAG_PREFIX}/doc-katacoda:base

katacoda/generate.bash

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -vex
+
+HERE="$( cd "$(dirname "$0")" ; pwd -P )"
+
+if [[ -d ${HERE}/build ]] ; then
+    echo "Please delete ${PWD}/build directory first."
+    exit
+fi
+
+export RELEASE_HASH="${RELEASE_HASH:-$(curl -s https://api.github.com/repos/iterative/dvc/releases/latest | sha256sum | cut -c -8)}"
+export TAG_PREFIX="${TAG_PREFIX:-dvcorg}"
+
+find ${HERE} -name Dockerfile.template | sort | while read -r filepath  ; do
+    ABSOLUTE_SOURCE=$(dirname "$filepath")
+    SOURCE_DIR=$(realpath --relative-to=${HERE} ${ABSOLUTE_SOURCE})
+    TARGET_DIR=${HERE}/build/${SOURCE_DIR}
+    if [ ! -d ${TARGET_DIR} ] ; then
+        mkdir -p ${TARGET_DIR}
+    fi
+    cp -fr ${ABSOLUTE_SOURCE}/* ${TARGET_DIR}
+    cat ${ABSOLUTE_SOURCE}/Dockerfile.template | envsubst > ${TARGET_DIR}/Dockerfile
+    cat ${ABSOLUTE_SOURCE}/Dockertag.template | envsubst > ${TARGET_DIR}/Dockertag
+    rm -f ${TARGET_DIR}/Dockerfile.template
+    rm -f ${TARGET_DIR}/Dockertag.template
+done
+
+unset RELEASE_HASH

katacoda/get-started/01-initialize/Dockerfile → katacoda/get-started/01-initialize/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM dvcorg/doc-katacoda:base
+FROM ${TAG_PREFIX}/doc-katacoda:base
 
 
 RUN RELEASE_HASH=${RELEASE_HASH} \

katacoda/get-started/01-initialize/Dockertag.template

@@ -0,0 +1 @@
+${TAG_PREFIX}/doc-katacoda:start-initialize

katacoda/get-started/02-versioning/Dockerfile → katacoda/get-started/02-versioning/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM dvcorg/doc-katacoda:base
+FROM ${TAG_PREFIX}/doc-katacoda:base
 
 RUN RELEASE_HASH=${RELEASE_HASH} \
     git clone https://github.com/iterative/example-get-started \

katacoda/get-started/02-versioning/Dockertag.template

@@ -0,0 +1 @@
+${TAG_PREFIX}/doc-katacoda:start-versioning

katacoda/get-started/03-accessing/Dockerfile → katacoda/get-started/03-accessing/Dockerfile.template

@@ -1,6 +1,5 @@
-FROM dvcorg/doc-katacoda:base
+FROM ${TAG_PREFIX}/doc-katacoda:base
 
-ARG RELEASE_HASH 
 RUN RELEASE_HASH=${RELEASE_HASH} \
     apt-get update -y && apt-get install -y \
                          python3 \

katacoda/get-started/03-accessing/Dockertag.template

@@ -0,0 +1 @@
+${TAG_PREFIX}/doc-katacoda:start-accessing

katacoda/get-started/04-stages/Dockerfile → katacoda/get-started/04-stages/Dockerfile.template

@@ -1,7 +1,5 @@
-FROM dvcorg/doc-katacoda:base
+FROM ${TAG_PREFIX}/doc-katacoda:base
 
-
-ARG RELEASE_HASH
 RUN RELEASE_HASH=${RELEASE_HASH} \
     git clone \
     https://github.com/iterative/example-get-started \

katacoda/get-started/04-stages/Dockertag.template

@@ -0,0 +1 @@
+${TAG_PREFIX}/doc-katacoda:start-stages

katacoda/get-started/05-params-metrics-plots/Dockerfile → katacoda/get-started/05-params-metrics-plots/Dockerfile.template

@@ -1,6 +1,5 @@
-FROM dvcorg/doc-katacoda:base
+FROM ${TAG_PREFIX}/doc-katacoda:base
 
-ARG RELEASE_HASH
 RUN RELEASE_HASH=${RELEASE_HASH} \
     git clone \
     https://github.com/iterative/example-get-started \

katacoda/get-started/05-params-metrics-plots/Dockertag.template

@@ -0,0 +1 @@
+${TAG_PREFIX}/doc-katacoda:start-params

katacoda/get-started/06-experiments/Dockerfile → katacoda/get-started/06-experiments/Dockerfile.template

@@ -1,6 +1,5 @@
-FROM dvcorg/doc-katacoda:base
+FROM ${TAG_PREFIX}/doc-katacoda:base
 
-ARG RELEASE_HASH
 RUN RELEASE_HASH=${RELEASE_HASH} \
     git clone \
     https://github.com/iterative/dvc-get-started --branch evaluation \
@@ -19,9 +18,6 @@ RUN RELEASE_HASH=${RELEASE_HASH} \
     && pip3 install -r requirements.txt
 
 
-# RUN RELEASE_HASH=${RELEASE_HASH} \
-#     dvc pull 
-
 COPY start.sh /root/start.sh
 
 EXPOSE 80

katacoda/get-started/06-experiments/Dockertag.template

@@ -0,0 +1 @@
+${TAG_PREFIX}/doc-katacoda:start-experiments

push-all.bash

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -vex
+
+HERE="$( cd "$(dirname "$0")" ; pwd -P )"
+export RELEASE_HASH="${RELEASE_HASH:-$(curl -s https://api.github.com/repos/iterative/dvc/releases/latest | sha256sum | cut -c -8)}"
+export TAG_PREFIX="${TAG_PREFIX:-dvcorg}"
+
+DIR=$(dirname $0)
+cd "${DIR}"
+
+find $DIR -name Dockerfile | sort | while read -r filepath ; do
+    dockerdir=$(dirname ${filepath})
+    tagfile=${dockerdir}/Dockertag
+    if [ -f ${tagfile} ] ; then
+        TAG=$(head -n 1 ${tagfile})
+    else
+        TAG=$(echo "${dockerdir}[3,100]}" | tr '/ ' '--')
+    fi
+    if [[ "${TAG}" ~= '.*/.*' ]] ; then
+        echo "PUSHING: ${dockerdir} with the tag: ${TAG}"
+        docker push ${TAG}
+    else 
+        echo "PUSHING: ${dockerdir} with the tag: ${TAG_PREFIX}/${TAG}"
+        docker push ${TAG_PREFIX}/${TAG}
+    fi
+done

start/.gitignore

@@ -0,0 +1,2 @@
+dvc-get-started/
+build/

start/Dockerfile → start/Dockerfile.template

@@ -1,28 +1,21 @@
-FROM ubuntu:20.04
+FROM python:3.8
 
 WORKDIR /root
 
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 
-ARG RELEASE_HASH
 RUN RELEASE_HASH=${RELEASE_HASH} \
     apt-get update -y && apt-get install -y \
                          gnupg \
                          wget \
                          tree
-
-RUN wget \
-       https://dvc.org/deb/dvc.list \
-       -O /etc/apt/sources.list.d/dvc.list
-
-RUN wget -qO - https://dvc.org/deb/iterative.asc | apt-key add -
-
+
 RUN RELEASE_HASH=${RELEASE_HASH} \
-    apt-get update -y && apt-get install -y \
-                         dvc 
+    pip install 'dvc[all]'
 
-COPY bashrc .bashrc
+COPY dvc-get-started dvc-get-started
+COPY .bashrc .bashrc
 
 # Configure git user name and email
 RUN git config --global user.email "[email protected]" \

start/Dockertag.template

@@ -0,0 +1 @@
+dvcorg/doc-start:${GIT_TAG}

start/generate.bash

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+
+HERE="$( cd "$(dirname "$0")" ; pwd -P )"
+
+if [[ -d build ]] ; then
+    echo "Please delete ${PWD}/build directory first."
+    exit
+fi
+
+# Clone dvc-get-started
+git clone https://github.com/iterative/dvc-get-started
+
+GIT_TAGS=$(git -C dvc-get-started tag --list)
+
+for TAG in ${GIT_TAGS} ; do
+    TAG_DIR="build/${TAG}"
+    mkdir -p ${TAG_DIR}
+
+    export GIT_TAG=${TAG}
+
+    git clone dvc-get-started -b ${GIT_TAG} ${TAG_DIR}/dvc-get-started
+
+    cp bashrc ${TAG_DIR}/.bashrc
+    cat Dockerfile.template | envsubst > ${TAG_DIR}/Dockerfile
+    cat Dockertag.template | envsubst > ${TAG_DIR}/Dockertag
+done
+
+unset GIT_TAG
+unset RELEASE_HASH