diff options
Diffstat (limited to '')
| -rw-r--r-- | build/db-init/Dockerfile | 3 | ||||
| -rw-r--r-- | build/init/Dockerfile | 3 | ||||
| -rw-r--r-- | build/nginx/Dockerfile | 3 | ||||
| -rwxr-xr-x | build/nginx/entrypoint.sh | 5 | ||||
| -rw-r--r-- | build/nginx/nginx.conf | 2 | ||||
| -rw-r--r-- | build/php/Dockerfile | 3 | ||||
| -rw-r--r-- | build/postgres/Dockerfile | 3 | ||||
| -rw-r--r-- | build/postgrest/Dockerfile | 3 |
8 files changed, 19 insertions, 6 deletions
diff --git a/build/db-init/Dockerfile b/build/db-init/Dockerfile index c5a4b59..7bc16ce 100644 --- a/build/db-init/Dockerfile +++ b/build/db-init/Dockerfile @@ -15,7 +15,8 @@ ### ### You should have received a copy of the GNU General Public License ### along with CRIMSON. If not, see <http://www.gnu.org/licenses/>. -FROM alpine:latest +ARG ALPINE_VERSION="3.23" +FROM alpine:${ALPINE_VERSION} # install packages RUN apk add --no-cache postgresql16-client tini shadow sed diff --git a/build/init/Dockerfile b/build/init/Dockerfile index cd2af92..176b07f 100644 --- a/build/init/Dockerfile +++ b/build/init/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:latest +ARG ALPINE_VERSION="3.23" +FROM alpine:${ALPINE_VERSION} # install packages RUN apk add --no-cache tini shadow coreutils findutils diff --git a/build/nginx/Dockerfile b/build/nginx/Dockerfile index f74d555..2094d4d 100644 --- a/build/nginx/Dockerfile +++ b/build/nginx/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:latest +ARG ALPINE_VERSION="3.23" +FROM alpine:${ALPINE_VERSION} # install packages RUN apk add --no-cache nginx shadow curl tini diff --git a/build/nginx/entrypoint.sh b/build/nginx/entrypoint.sh index 6dc7eec..e7d06bf 100755 --- a/build/nginx/entrypoint.sh +++ b/build/nginx/entrypoint.sh @@ -1,8 +1,13 @@ #!/bin/sh +## disable api if not set to "true" if [ ! "$API_ENABLED" = "true" ]; then echo "" > /etc/nginx/nginx.api.conf echo "" > /etc/nginx/nginx.api.server.conf fi +## make sure override files exist as empty if not found +touch /etc/nginx/nginx.override.conf +touch /etc/nginx/nginx.override.server.conf + exec -a /usr/sbin/nginx /usr/sbin/nginx -c /etc/nginx/nginx.conf diff --git a/build/nginx/nginx.conf b/build/nginx/nginx.conf index d3dc0ae..2f09165 100644 --- a/build/nginx/nginx.conf +++ b/build/nginx/nginx.conf @@ -18,6 +18,7 @@ http { access_log /var/log/nginx/access.log; include "nginx.api.conf"; + include "nginx.override.conf"; server { listen 8080; @@ -32,6 +33,7 @@ http { gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml image/x-icon; include "nginx.api.server.conf"; + include "nginx.override.server.conf"; location /favicon.ico { add_header Cache-Control "public, max-age=31536000, immutable"; diff --git a/build/php/Dockerfile b/build/php/Dockerfile index 5f4bdd5..a1bc31a 100644 --- a/build/php/Dockerfile +++ b/build/php/Dockerfile @@ -1,4 +1,5 @@ -FROM php:fpm-alpine +ARG ALPINE_VERSION="3.23" +FROM php:fpm-alpine${ALPINE_VERSION} # install packages RUN apk add --no-cache postgresql-dev runuser shadow diff --git a/build/postgres/Dockerfile b/build/postgres/Dockerfile index 8223800..32d0c7e 100644 --- a/build/postgres/Dockerfile +++ b/build/postgres/Dockerfile @@ -1,4 +1,5 @@ -FROM postgres:16-alpine +ARG ALPINE_VERSION="3.23" +FROM postgres:16-alpine${ALPINE_VERSION} # install packages RUN apk add --no-cache make git shadow diff --git a/build/postgrest/Dockerfile b/build/postgrest/Dockerfile index 747052f..eb281d1 100644 --- a/build/postgrest/Dockerfile +++ b/build/postgrest/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:latest +ARG ALPINE_VERSION="3.23" +FROM alpine:${ALPINE_VERSION} # install packages RUN apk add --no-cache tini wget curl shadow |