From 7d845b9e6422f7d2d66d7dad4586ec00b83598fd Mon Sep 17 00:00:00 2001 From: Ploc <391-ploc@users.noreply.framagit.org> Date: Fri, 18 Jun 2021 12:18:40 +0200 Subject: [PATCH] chore: merge subshell into shell Merge install-dev-env.sh subshell into build.sh shell. --- docker/build.sh | 2 +- docker/install-dev-env.sh | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 docker/install-dev-env.sh diff --git a/docker/build.sh b/docker/build.sh index 964ac57..b6f83ad 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -3,7 +3,7 @@ set -eu apk --update add perl libpq perl-crypt-rijndael perl-io-socket-ssl perl-net-ssleay su-exec shared-mime-info libressl imagemagick imagemagick-perlmagick -sh $(dirname $0)/install-dev-env.sh +apk --update add --virtual .build-deps build-base perl-utils perl-dev postgresql-dev vim wget zlib-dev cpan notest Carton Config::FromHash carton install --without test diff --git a/docker/install-dev-env.sh b/docker/install-dev-env.sh deleted file mode 100644 index 2f219d7..0000000 --- a/docker/install-dev-env.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env sh - -apk --update add --virtual .build-deps build-base perl-utils perl-dev postgresql-dev vim wget zlib-dev \ No newline at end of file