From 111ba0d63eeb0f520e107b0d6777e23b4ff25beb Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 8 Feb 2024 17:38:30 +1100 Subject: [PATCH] Updated bay-cli install to use new archive format --- images/php/Dockerfile.cli | 5 ++++- images/php/Dockerfile.fpm | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/images/php/Dockerfile.cli b/images/php/Dockerfile.cli index c779bd26..9c69d6a2 100644 --- a/images/php/Dockerfile.cli +++ b/images/php/Dockerfile.cli @@ -22,7 +22,10 @@ RUN wget -O /usr/local/bin/dockerize https://github.com/dpc-sdp/dockerize/releas RUN apk add redis --no-cache # Install bay-cli. -RUN wget "https://github.com/dpc-sdp/bay-cli/releases/download/v0.1.0/bay_$(echo ${TARGETPLATFORM:-linux/amd64} | tr '/' '_')" -O /bin/bay && \ +RUN wget "https://github.com/dpc-sdp/bay-cli/releases/download/v0.1.1/bay_$(echo ${TARGETPLATFORM:-linux/amd64} | tr '/' '_').tar.gz" -O /tmp/bay.tgz && \ + cd /tmp && \ + tar -vxxzf bay.tgz && \ + mv bay /bin/bay && \ chmod +x /bin/bay RUN mkdir /bay diff --git a/images/php/Dockerfile.fpm b/images/php/Dockerfile.fpm index e845dfd3..a391e359 100644 --- a/images/php/Dockerfile.fpm +++ b/images/php/Dockerfile.fpm @@ -24,7 +24,10 @@ RUN apk add --no-cache tzdata \ && echo $TZ > /etc/timezone # Install bay-cli. -RUN wget "https://github.com/dpc-sdp/bay-cli/releases/download/v0.0.1/bay_$(echo ${TARGETPLATFORM:-linux/amd64} | tr '/' '_')" -O /bin/bay && \ +RUN wget "https://github.com/dpc-sdp/bay-cli/releases/download/v0.1.1/bay_$(echo ${TARGETPLATFORM:-linux/amd64} | tr '/' '_').tar.gz" -O /tmp/bay.tgz && \ + cd /tmp && \ + tar -vxxzf bay.tgz && \ + mv bay /bin/bay && \ chmod +x /bin/bay ONBUILD ARG BAY_DISABLE_FUNCTIONS=phpinfo,pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,system,exec,shell_exec,passthru,phpinfo,show_source,highlight_file,popen,fopen_with_path,dbmopen,dbase_open,filepro,filepro_rowcount,filepro_retrieve,posix_mkfifo