From c10cc22ee53202ae57fe8e43d5bceb7cc41890c1 Mon Sep 17 00:00:00 2001 From: Alex <apuret@e-biz.fr> Date: Tue, 16 Feb 2021 16:18:14 +0100 Subject: [PATCH] feat: add build script, upgrade to 1.2.4 dcli and dind to 20.10.3 --- ci-deadlock-cli/Dockerfile | 2 +- ci-deadlock-cli/README.md | 6 +----- ci-deadlock-cli/build.sh | 9 +++++++++ 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100755 ci-deadlock-cli/build.sh diff --git a/ci-deadlock-cli/Dockerfile b/ci-deadlock-cli/Dockerfile index 042bbc4..82f89c8 100644 --- a/ci-deadlock-cli/Dockerfile +++ b/ci-deadlock-cli/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:18.09.6-dind +FROM docker:20.10.3-dind RUN apk add --update python3-dev py-pip gcc musl-dev maven RUN pip3 install --upgrade pip diff --git a/ci-deadlock-cli/README.md b/ci-deadlock-cli/README.md index 47d196a..f266f68 100644 --- a/ci-deadlock-cli/README.md +++ b/ci-deadlock-cli/README.md @@ -5,9 +5,5 @@ This Dockerfile installs deadlock-cli inside a docker-in-docker container # Steps to upgrade image ```bash -$ NEW_VERSION=x.y -$ docker build -t ci-deadlock-cli:$NEW_VERSION . -$ docker tag ci-deadlock-cli:$NEW_VERSION registry.e-biz.fr/apuret/deadlock-public/ci-deadlock-cli:$NEW_VERSION -$ docker login registry.e-biz.fr/apuret/deadlock-public/ -$ docker push registry.e-biz.fr/apuret/deadlock-public/ci-deadlock-cli:$NEW_VERSION +> ./build.sh VERSION ``` diff --git a/ci-deadlock-cli/build.sh b/ci-deadlock-cli/build.sh new file mode 100755 index 0000000..ae5a5e8 --- /dev/null +++ b/ci-deadlock-cli/build.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +[ -z "$1" ] && echo "Version not specified" && exit 1; + +NEW_VERSION=$1 +docker build -t ci-deadlock-cli:$NEW_VERSION . +docker tag ci-deadlock-cli:$NEW_VERSION registry.e-biz.fr/apuret/deadlock-public/ci-deadlock-cli:$NEW_VERSION +docker login registry.e-biz.fr/apuret/deadlock-public/ +docker push registry.e-biz.fr/apuret/deadlock-public/ci-deadlock-cli:$NEW_VERSION \ No newline at end of file -- GitLab