Compare commits
3
Commits
c700c33569
...
v1-config
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
446b4e4e36 | ||
|
|
e6e95ad31c | ||
|
|
a36d84048d |
@@ -45,6 +45,7 @@ RUN set -xe \
|
|||||||
sudo \
|
sudo \
|
||||||
iproute2 \
|
iproute2 \
|
||||||
vim \
|
vim \
|
||||||
|
wget \
|
||||||
libgfortran5 \
|
libgfortran5 \
|
||||||
&& apt-get autoclean -y \
|
&& apt-get autoclean -y \
|
||||||
&& apt-get autoremove -y
|
&& apt-get autoremove -y
|
||||||
|
|||||||
@@ -26,6 +26,9 @@ $BuildArgs = @("-t", "piscal:$Version", "-t", "piscal:latest", "-t", "piscal:dev
|
|||||||
if ($env:PISCAL_SSH_PASSWORD) {
|
if ($env:PISCAL_SSH_PASSWORD) {
|
||||||
$BuildArgs += "--build-arg", "SSH_PASSWORD=$($env:PISCAL_SSH_PASSWORD)"
|
$BuildArgs += "--build-arg", "SSH_PASSWORD=$($env:PISCAL_SSH_PASSWORD)"
|
||||||
}
|
}
|
||||||
|
if ($env:PISCAL_BUILD_NO_CACHE) {
|
||||||
|
$BuildArgs += "--no-cache"
|
||||||
|
}
|
||||||
docker build @BuildArgs .
|
docker build @BuildArgs .
|
||||||
|
|
||||||
if ($LASTEXITCODE -eq 0) {
|
if ($LASTEXITCODE -eq 0) {
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ BUILD_ARGS=(-t "piscal:${VERSION}" -t piscal:latest -t piscal:dev)
|
|||||||
if [ -n "${PISCAL_SSH_PASSWORD:-}" ]; then
|
if [ -n "${PISCAL_SSH_PASSWORD:-}" ]; then
|
||||||
BUILD_ARGS+=(--build-arg "SSH_PASSWORD=${PISCAL_SSH_PASSWORD}")
|
BUILD_ARGS+=(--build-arg "SSH_PASSWORD=${PISCAL_SSH_PASSWORD}")
|
||||||
fi
|
fi
|
||||||
|
[ -n "${PISCAL_BUILD_NO_CACHE:-}" ] && BUILD_ARGS+=(--no-cache)
|
||||||
|
|
||||||
docker build "${BUILD_ARGS[@]}" .
|
docker build "${BUILD_ARGS[@]}" .
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user