diff options
Diffstat (limited to '')
| -rw-r--r-- | build/db-init/Dockerfile | 3 | ||||
| -rw-r--r-- | build/init/Dockerfile | 1 | ||||
| -rw-r--r-- | build/nginx/Dockerfile | 2 | ||||
| -rw-r--r-- | build/postgrest/Dockerfile | 7 | ||||
| -rw-r--r-- | src/router.php | 1 |
5 files changed, 12 insertions, 2 deletions
diff --git a/build/db-init/Dockerfile b/build/db-init/Dockerfile index 7bc16ce..c5f59f3 100644 --- a/build/db-init/Dockerfile +++ b/build/db-init/Dockerfile @@ -29,9 +29,12 @@ RUN usermod --uid 1000 db-init # copy scripts COPY ./db-init /usr/local/bin/db-init +RUN chmod +rx /usr/local/bin/db-init + COPY ./rev.sql /var/lib/rev.sql COPY ./ext.sql /var/lib/ext.sql COPY ./base.sql /var/lib/base.sql +RUN chmod +r /var/lib/*.sql # remove build packages RUN apk del shadow diff --git a/build/init/Dockerfile b/build/init/Dockerfile index 176b07f..0c1a7dc 100644 --- a/build/init/Dockerfile +++ b/build/init/Dockerfile @@ -13,6 +13,7 @@ RUN usermod --uid 1000 init # copy scripts COPY ./init /usr/local/bin/init COPY ./stamp.sh /usr/local/bin/stamp.sh +RUN chmod +rx /usr/local/bin/* # remove build packages RUN apk del shadow diff --git a/build/nginx/Dockerfile b/build/nginx/Dockerfile index 2094d4d..e78dd02 100644 --- a/build/nginx/Dockerfile +++ b/build/nginx/Dockerfile @@ -23,7 +23,7 @@ RUN chown -R nginx:nginx /etc/nginx # copy entrypoint COPY ./entrypoint.sh /usr/local/bin/entrypoint -RUN chmod +x /usr/local/bin/entrypoint +RUN chmod +rx /usr/local/bin/entrypoint # do the USER nginx diff --git a/build/postgrest/Dockerfile b/build/postgrest/Dockerfile index eb281d1..9fa8644 100644 --- a/build/postgrest/Dockerfile +++ b/build/postgrest/Dockerfile @@ -1,4 +1,6 @@ ARG ALPINE_VERSION="3.23" +ARG POSTGREST_VERSION="14.5" +ARG POSTGREST_ARCH="linux-static-x86-64" FROM alpine:${ALPINE_VERSION} # install packages @@ -11,12 +13,15 @@ RUN groupmod --gid 1000 postgrest RUN usermod --uid 1000 postgrest # install postgrest -RUN wget "https://github.com/PostgREST/postgrest/releases/download/v12.2.3/postgrest-v12.2.3-linux-static-x64.tar.xz" -O /tmp/postgrest.tar.xz +ARG POSTGREST_VERSION +ARG POSTGREST_ARCH +RUN wget "https://github.com/PostgREST/postgrest/releases/download/v${POSTGREST_VERSION}/postgrest-v${POSTGREST_VERSION}-${POSTGREST_ARCH}.tar.xz" -O /tmp/postgrest.tar.xz RUN tar xJf /tmp/postgrest.tar.xz -C /usr/local/bin RUN rm /tmp/postgrest.tar.xz # copy scripts COPY ./entrypoint.sh /usr/local/bin/entrypoint.sh +RUN chmod +rx /usr/local/bin/entrypoint.sh # remove build packages RUN apk del shadow diff --git a/src/router.php b/src/router.php index 141e7cf..c49c23d 100644 --- a/src/router.php +++ b/src/router.php @@ -162,6 +162,7 @@ class Router extends Base { array( 'uri' => $uri, 'uri_str' => $uri_str, + 'path' => $path, 'method' => $method, 'ip' => $this->get_ip() ), |