From 40c9cb968c3e8e7c0dff25a2b97049b852d2b6b3 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Mon, 5 Apr 2021 18:17:06 +0400 Subject: [PATCH] =?UTF-8?q?supprimer=20docker/=20qui=20est=20obsol=C3=A8te?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/.dockerignore | 1 - docker/.gitignore | 2 -- docker/Dockerfile | 12 -------- docker/build | 72 -------------------------------------------- docker/build.env | 15 --------- 5 files changed, 102 deletions(-) delete mode 100644 docker/.dockerignore delete mode 100644 docker/.gitignore delete mode 100644 docker/Dockerfile delete mode 100755 docker/build delete mode 100644 docker/build.env diff --git a/docker/.dockerignore b/docker/.dockerignore deleted file mode 100644 index dcf0102..0000000 --- a/docker/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -/b/t/ diff --git a/docker/.gitignore b/docker/.gitignore deleted file mode 100644 index 0797d89..0000000 --- a/docker/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/b/ -/build.env.local diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 27bb578..0000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM ur/d9base - -ARG date -ARG version -LABEL date=$date version=$version - -ENV I=/install/nutools -COPY . $I -RUN $I/uinst -y $I && rm -rf $I - -ENV PATH="$PATH:/usr/local/nutools" -CMD ["/bin/bash", "-il"] diff --git a/docker/build b/docker/build deleted file mode 100755 index 65989cf..0000000 --- a/docker/build +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source /etc/ulibauto || exit 1 - -function display_help() { - uecho "$scriptname: construire $NAME - -USAGE - $scriptname [options] - -OPTIONS - -b, --build - -n, --no-cache" -} - -function do_prereqs() { - : -} -function do_build() { - local date; local -a args - setx date=date +%y%m%d - args=( - -f Dockerfile - -t $NAME:latest - --build-arg "date=$date" - ${no_cache:+--no-cache} - ) - - etitle "Création de l'image docker $NAME" \ - docker build "${args[@]}" "$CTXDIR" -} -function do_run() { - docker run -it --rm "$NAME" -} - -cd "$scriptdir" -source ./build.env || die "Impossible de trouver build.env" -[ -f build.env.local ] && source build.env.local - -auto=1 -prereqs= -build= -no_cache= -run= -args=( - --help '$exit_with display_help' - --prereqs '$prereqs=1; auto=' - -b,--build '$build=1; auto=' - -n,--no-cache no_cache=1 - -r,--run '$run=1; auto=' -) -parse_args "$@"; set -- "${args[@]}" - -if [ -n "$prereqs" ]; then - build= - run= -elif [ -n "$auto" ]; then - build=1 -fi - -if [ -n "$prereqs" ]; then - do_prereqs "$@" || die -fi - -if [ -n "$build" ]; then - do_build "$@" || die -fi - -if [ -n "$run" ]; then - do_run "$@" || die -fi - diff --git a/docker/build.env b/docker/build.env deleted file mode 100644 index 4b53837..0000000 --- a/docker/build.env +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -# Nom de l'image -NAME=ur/nutools -# Build context pour docker -CTXDIR=.. -# Répertoire contenant les fichiers nécessaire au build -BUILDDIR=b -# Répertoire temporaire pour construire les fichiers de BUILDDIR. Ce répertoire -# n'est pas transmis au daemon docker -TRANSDIR=b/t - -# Fonctions spécifiques -#function do_prereqs() { :; } -#function do_build() { :; } -#function do_run() { :; }