From 1820a5b6ac18794a83bc4f84962877102de64937 Mon Sep 17 00:00:00 2001 From: Tim Hess Date: Fri, 9 Feb 2024 15:05:55 -0600 Subject: [PATCH] minor tweaks --- .editorconfig | 3 +++ .mvn/wrapper/maven-wrapper.properties | 2 +- Dockerfile | 6 ++++-- deploy/docker/docker-entrypoint.sh | 2 -- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.editorconfig b/.editorconfig index c7616d4f..98ca2e3b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,3 +5,6 @@ indent_style = space [*.{js,json}] indent_size = 2 + +[*.sh] +end_of_line = lf \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 5a40fb45..5f0536eb 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.5-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/Dockerfile b/Dockerfile index 777f9639..064878e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,8 +25,10 @@ RUN echo "env INITIALIZR_SERVICE_HOST;" >> /etc/nginx/main.d/default.conf RUN echo "env INITIALIZR_SERVICE_URI;" >> /etc/nginx/main.d/default.conf COPY deploy/docker/initializr-web.conf.template /etc/nginx/templates/ COPY deploy/docker/docker-entrypoint.sh ./ -RUN chmod +x docker-entrypoint.sh +RUN chmod +x ./docker-entrypoint.sh ENTRYPOINT [ "./docker-entrypoint.sh" ] CMD ["nginx", "-g", "daemon off;"] -# cat /etc/nginx/sites-enabled/initializr.conf \ No newline at end of file +# cat /etc/nginx/sites-enabled/initializr.conf +# tail -f /var/log/nginx/access.log +# tail -f /var/log/nginx/error.log \ No newline at end of file diff --git a/deploy/docker/docker-entrypoint.sh b/deploy/docker/docker-entrypoint.sh index 6f65c77a..74ddd99a 100644 --- a/deploy/docker/docker-entrypoint.sh +++ b/deploy/docker/docker-entrypoint.sh @@ -5,6 +5,4 @@ echo "Starting up with these env variables... host: $INITIALIZR_SERVICE_HOST, ur envsubst '$INITIALIZR_SERVICE_HOST $INITIALIZR_SERVICE_URI' < /etc/nginx/templates/initializr-web.conf.template > /etc/nginx/sites-enabled/initializr.conf -# cat /etc/nginx/sites-enabled/initializr.conf - exec "$@" \ No newline at end of file