From 897e4135d3e48d64a3294ca8a463747f7c0074f8 Mon Sep 17 00:00:00 2001 From: Nicolas Duchon Date: Wed, 4 Aug 2021 08:48:25 +0200 Subject: [PATCH 1/2] build: docker-gen 0.7.6 -> 0.7.7 --- Dockerfile | 2 +- Dockerfile.alpine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b5bb1c1..fbe9f7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # setup build arguments for version of dependencies to use -ARG DOCKER_GEN_VERSION=0.7.6 +ARG DOCKER_GEN_VERSION=0.7.7 ARG FOREGO_VERSION=v0.17.0 # Use a specific version of golang to build both binaries diff --git a/Dockerfile.alpine b/Dockerfile.alpine index b71a58d..221b0ae 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,5 +1,5 @@ # setup build arguments for version of dependencies to use -ARG DOCKER_GEN_VERSION=0.7.6 +ARG DOCKER_GEN_VERSION=0.7.7 ARG FOREGO_VERSION=v0.17.0 # Use a specific version of golang to build both binaries From 8526d918ed6661c8bdc5b7e4652f4e19c697a250 Mon Sep 17 00:00:00 2001 From: Nicolas Duchon Date: Wed, 4 Aug 2021 08:49:23 +0200 Subject: [PATCH 2/2] style: Dockerfiles linting --- Dockerfile | 14 +++++++------- Dockerfile.alpine | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index fbe9f7f..5b1801c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,17 +41,17 @@ LABEL maintainer="Nicolas Duchon (@buchdag)" # Install wget and install/updates certificates RUN apt-get update \ - && apt-get install -y -q --no-install-recommends \ - ca-certificates \ - wget \ - && apt-get clean \ - && rm -r /var/lib/apt/lists/* + && apt-get install -y -q --no-install-recommends \ + ca-certificates \ + wget \ + && apt-get clean \ + && rm -r /var/lib/apt/lists/* # Configure Nginx and apply fix for very long server names RUN echo "daemon off;" >> /etc/nginx/nginx.conf \ - && sed -i 's/worker_processes 1/worker_processes auto/' /etc/nginx/nginx.conf \ - && sed -i 's/worker_connections 1024/worker_connections 10240/' /etc/nginx/nginx.conf + && sed -i 's/worker_processes 1/worker_processes auto/' /etc/nginx/nginx.conf \ + && sed -i 's/worker_connections 1024/worker_connections 10240/' /etc/nginx/nginx.conf # Install Forego + docker-gen COPY --from=forego /usr/local/bin/forego /usr/local/bin/forego diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 221b0ae..40177e0 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -42,13 +42,13 @@ LABEL maintainer="Nicolas Duchon (@buchdag)" # Install wget and install/updates certificates RUN apk add --no-cache --virtual .run-deps \ - ca-certificates bash wget openssl \ - && update-ca-certificates + ca-certificates bash wget openssl \ + && update-ca-certificates # Configure Nginx and apply fix for very long server names RUN echo "daemon off;" >> /etc/nginx/nginx.conf \ - && sed -i 's/worker_processes 1/worker_processes auto/' /etc/nginx/nginx.conf \ - && sed -i 's/worker_connections 1024/worker_connections 10240/' /etc/nginx/nginx.conf + && sed -i 's/worker_processes 1/worker_processes auto/' /etc/nginx/nginx.conf \ + && sed -i 's/worker_connections 1024/worker_connections 10240/' /etc/nginx/nginx.conf # Install Forego + docker-gen COPY --from=forego /usr/local/bin/forego /usr/local/bin/forego