diff --git a/Dockerfile b/Dockerfile index c6feea15..37451739 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,12 +46,16 @@ ENV LOG_CHANNEL=stderr USER root RUN apk add --no-cache \ - build-base \ git \ - bash \ curl \ + zip \ + unzip \ + wget; sync + +RUN apk add --no-cache \ + build-base \ + bash \ jq \ - wget \ ca-certificates \ openssl \ openssh \ @@ -62,8 +66,6 @@ RUN apk add --no-cache \ gcompat \ groff \ cmake \ - zip \ - unzip \ libffi-dev \ bzip2-dev \ python3 \ @@ -75,8 +77,8 @@ RUN apk add --no-cache \ # Install AWSCli v2 # # =================== # # RUN curl -s https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip -o awscliv2.zip &&\ -# unzip awscliv2.zip &&\ -# ./aws/install; sync +# unzip awscliv2.zip; sync &&\ +# ./aws/install --bin-dir /usr/local/bin/; sync COPY --from=devopscorner/aws-cli:latest /usr/local/aws-cli/ /usr/local/aws-cli/ COPY --from=devopscorner/aws-cli:latest /usr/local/bin/ /usr/local/bin/ diff --git a/Dockerfile-Laravel-9 b/Dockerfile-Laravel-9 index c6feea15..37451739 100644 --- a/Dockerfile-Laravel-9 +++ b/Dockerfile-Laravel-9 @@ -46,12 +46,16 @@ ENV LOG_CHANNEL=stderr USER root RUN apk add --no-cache \ - build-base \ git \ - bash \ curl \ + zip \ + unzip \ + wget; sync + +RUN apk add --no-cache \ + build-base \ + bash \ jq \ - wget \ ca-certificates \ openssl \ openssh \ @@ -62,8 +66,6 @@ RUN apk add --no-cache \ gcompat \ groff \ cmake \ - zip \ - unzip \ libffi-dev \ bzip2-dev \ python3 \ @@ -75,8 +77,8 @@ RUN apk add --no-cache \ # Install AWSCli v2 # # =================== # # RUN curl -s https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip -o awscliv2.zip &&\ -# unzip awscliv2.zip &&\ -# ./aws/install; sync +# unzip awscliv2.zip; sync &&\ +# ./aws/install --bin-dir /usr/local/bin/; sync COPY --from=devopscorner/aws-cli:latest /usr/local/aws-cli/ /usr/local/aws-cli/ COPY --from=devopscorner/aws-cli:latest /usr/local/bin/ /usr/local/bin/ diff --git a/README.md b/README.md index e6a6d5e3..2550e1b6 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ Laravel Kubernetes (EKS) Deployment Tools ## Available Tags -| Container | Pulls | -|------------|------| +| Containers | Pulls | +|-------------|-------| | Container `devopscorner/phpfpm` [Tags](docs/README-PHPFpm.md) | [![phpfpm pulls](https://img.shields.io/docker/pulls/devopscorner/phpfpm.svg?label=phpfpm%20pulls&logo=php)](https://hub.docker.com/r/devopscorner/phpfpm/) | | Container `devopscorner/laravel` [Tags](docs/README-Laravel.md) | [![laravel pulls](https://img.shields.io/docker/pulls/devopscorner/laravel.svg?label=laravel%20pulls&logo=laravel)](https://hub.docker.com/r/devopscorner/laravel/) |